Optimistic locking added for wiki edits.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@545 e93f8b46-1217-0410-a6f0-8f06a7374b81

Optimistic locking added for wiki edits.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@545 e93f8b46-1217-0410-a6f0-8f06a7374b81
f1231507 · Jean-Philippe Lang · c99da154 · f1231507 · f1231507 · f1231507
Commit f1231507 authored May 26, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

wiki_controller.rb app/controllers/wiki_controller.rb +6 -2

wiki_content.rb app/models/wiki_content.rb +1 -0

edit.rhtml app/views/wiki/edit.rhtml +1 -0

No files found.
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -60,14 +60,18 @@ class WikiController < ApplicationController
        redirect_to :action => 'index', :id => @project, :page => @page.title
        return
      end
-      @content.text = params[:content][:text]
-      @content.comments = params[:content][:comments]
+      #@content.text = params[:content][:text]
+      #@content.comments = params[:content][:comments]
+      @content.attributes = params[:content]
      @content.author = logged_in_user
      # if page is new @page.save will also save content, but not if page isn't a new record
      if (@page.new_record? ? @page.save : @content.save)
        redirect_to :action => 'index', :id => @project, :page => @page.title
      end
    end
+  rescue ActiveRecord::StaleObjectError
+    # Optimistic locking exception
+    flash[:notice] = l(:notice_locking_conflict)
  end
  
  # show page history

--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -18,6 +18,7 @@
 require 'zlib'

 class WikiContent < ActiveRecord::Base
+  set_locking_column :version
  belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id'
  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
  validates_presence_of :text

--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -5,6 +5,7 @@
 <h2><%= @page.pretty_title %></h2>

 <% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
+<%= f.hidden_field :version %>
 <%= error_messages_for 'content' %>
 <div class="contextual">
 <%= l(:setting_text_formatting) %>: