Anonymous avatar Anonymous committed 3fab638

data locking for issues

Comments (0)

Files changed (9)

redmine/app/controllers/issues_controller.rb

 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssuesController < ApplicationController
-	layout 'base'
-	before_filter :find_project, :authorize
+  layout 'base'
+  before_filter :find_project, :authorize
 
-	helper :custom_fields
-	include CustomFieldsHelper
-	
-	def show
+  helper :custom_fields
+  include CustomFieldsHelper
+
+  def show
+    @status_options = @issue.status.workflows.find(:all, :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
+    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
+  end
+
+  def edit
+    @priorities = Enumeration::get_values('IPRI')
+    if request.get?
+      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
+    else
+      begin
+        # Retrieve custom fields and values
+        @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
+        @issue.custom_values = @custom_values
+        @issue.attributes = params[:issue]
+        if @issue.save
+          flash[:notice] = l(:notice_successful_update)
+          redirect_to :action => 'show', :id => @issue
+        end
+      rescue ActiveRecord::StaleObjectError
+        # Optimistic locking exception
+        flash[:notice] = l(:notice_locking_conflict)
+      end
+    end		
+  end
+
+  def change_status
+    @history = @issue.histories.build(params[:history])	
     @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
-    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
-	end
+    if params[:confirm]
+      begin
+        @history.author_id = self.logged_in_user.id if self.logged_in_user
+        @issue.status = @history.status
+        @issue.fixed_version_id = (params[:issue][:fixed_version_id])
+        @issue.assigned_to_id = (params[:issue][:assigned_to_id])
+        @issue.lock_version = (params[:issue][:lock_version])
+        if @issue.save
+          flash[:notice] = l(:notice_successful_update)
+          Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
+          redirect_to :action => 'show', :id => @issue
+        end
+      rescue ActiveRecord::StaleObjectError
+        # Optimistic locking exception
+        flash[:notice] = l(:notice_locking_conflict)
+      end
+    end    
+    @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
+  end
 
-	def edit
-		@priorities = Enumeration::get_values('IPRI')
-		
-		if request.get?
-			@custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
-		else
-			# Retrieve custom fields and values
-			@custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-			@issue.custom_values = @custom_values
-			@issue.attributes = params[:issue]
-			if @issue.save
-				flash[:notice] = l(:notice_successful_update)
-				redirect_to :action => 'show', :id => @issue
-			end
-		end		
-	end
-	
-	def change_status
-		@history = @issue.histories.build(params[:history])	
-    @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
-		
-		if params[:confirm]
-				@history.author_id = self.logged_in_user.id if self.logged_in_user
-	
-			if @history.save			
-				@issue.status = @history.status
-				@issue.fixed_version_id = (params[:issue][:fixed_version_id])
-				@issue.assigned_to_id = (params[:issue][:assigned_to_id])	
-				if @issue.save
-					flash[:notice] = l(:notice_successful_update)
-					Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
-					redirect_to :action => 'show', :id => @issue
-				end
-			end
-		end    
-    @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
-    
-	end
-	
-	def destroy
-		@issue.destroy
-		redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
-	end
-  
+  def destroy
+    @issue.destroy
+    redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
+  end
+
   def add_attachment
     # Save the attachment
     if params[:attachment][:file].size > 0
 
 private
   def find_project
-    @issue = Issue.find(params[:id])
+    @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
     @project = @issue.project
   end  
 end

redmine/app/views/issues/change_status.rhtml

 <p><label for="history_notes"><%=l(:field_notes)%></label>
 <%= text_area 'history', 'notes', :cols => 60, :rows => 10  %></p>
 </div>
-
+
+<%= hidden_field 'issue', 'lock_version' %>
 <%= submit_tag l(:button_save) %>
 <%= end_form_tag %>

redmine/app/views/issues/edit.rhtml

 </select></p>
 <!--[eoform:issue]-->
 </div>
-
+<%= f.hidden_field :lock_version %>
 <%= submit_tag l(:button_save) %>
 <% end %>

redmine/app/views/issues/show.rhtml

 <div class="box">
 <h3><%=l(:label_history)%></h3>
 <table width="100%">
-<% for history in @issue.histories.find(:all, :include => :author) %>
+<% for history in @issue.histories.find(:all, :include => [:author, :status]) %>
 <tr>
 <td><%= format_date(history.created_on) %></td>
 <td><%= history.author.display_name %></td>

redmine/db/migrate/001_setup.rb

       t.column "assigned_to_id", :integer
       t.column "priority_id", :integer, :default => 0, :null => false
       t.column "fixed_version_id", :integer
-      t.column "author_id", :integer, :default => 0, :null => false
+      t.column "author_id", :integer, :default => 0, :null => false
+      t.column "lock_version", :integer, :default => 0, :null => false
       t.column "created_on", :timestamp
       t.column "updated_on", :timestamp
     end

redmine/lang/de.yml

 notice_successful_delete: Erfolgreiche Auslassung.
 notice_successful_connection: Erfolgreicher Anschluß.
 notice_file_not_found: Erbetene Akte besteht nicht oder ist gelöscht worden.
+notice_locking_conflict: Data have been updated by another user.
 
 gui_validation_error: 1 Störung
 gui_validation_error_plural: %d Störungen

redmine/lang/en.yml

 notice_successful_delete: Successful deletion.
 notice_successful_connection: Successful connection.
 notice_file_not_found: Requested file doesn't exist or has been deleted.
+notice_locking_conflict: Data have been updated by another user.
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errors

redmine/lang/es.yml

 notice_successful_delete: Successful deletion.
 notice_successful_connection: Successful connection.
 notice_file_not_found: Requested file doesn't exist or has been deleted.
+notice_locking_conflict: Data have been updated by another user.
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errores

redmine/lang/fr.yml

 notice_successful_delete: Suppression effectuée avec succès.
 notice_successful_connection: Connection réussie.
 notice_file_not_found: Le fichier demandé n'existe pas ou a été supprimé.
+notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
 
 gui_validation_error: 1 erreur
 gui_validation_error_plural: %d erreurs
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.