jro_apps/redmine Commit - r21:5f185b6c0532

data locking for issues...

Jean-Philippe Lang -

r21:5f185b6c0532

parent child

Context file:

r21:5f185b6c0532

Collapse all files

redmine/app/controllers/issues_controller.rb +56 -51

@@ -16,61 +16,66
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	class IssuesController < ApplicationController	18	class IssuesController < ApplicationController
19	layout 'base'	19	layout 'base'
20	before_filter :find_project, :authorize	20	before_filter :find_project, :authorize
21		21
22	helper :custom_fields	22	helper :custom_fields
23	include CustomFieldsHelper	23	include CustomFieldsHelper
24		24
25	def show	25	def show
26	@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	26	@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
27	@custom_values = @issue.custom_values.find(:all, :include => :custom_field)	27	@custom_values = @issue.custom_values.find(:all, :include => :custom_field)
28	end	28	end
29		29
30	def edit	30	def edit
31	@priorities = Enumeration::get_values('IPRI')	31	@priorities = Enumeration::get_values('IPRI')
32		32	if request.get?
33	if request.get?	33	@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) }
34	@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) }	34	else
35	else	35	begin
36	# Retrieve custom fields and values	36	# Retrieve custom fields and values
37	@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]) }	37	@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]) }
38	@issue.custom_values = @custom_values	38	@issue.custom_values = @custom_values
39	@issue.attributes = params[:issue]	39	@issue.attributes = params[:issue]
40	if @issue.save	40	if @issue.save
41	flash[:notice] = l(:notice_successful_update)	41	flash[:notice] = l(:notice_successful_update)
42	redirect_to :action => 'show', :id => @issue	42	redirect_to :action => 'show', :id => @issue
43	end	43	end
44	end	44	rescue ActiveRecord::StaleObjectError
45	end	45	# Optimistic locking exception
46		46	flash[:notice] = l(:notice_locking_conflict)
47	def change_status	47	end
48	@history = @issue.histories.build(params[:history])	48	end
		49	end
		50
		51	def change_status
		52	@history = @issue.histories.build(params[:history])
49	@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	53	@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
50		54	if params[:confirm]
51	if params[:confirm]	55	begin
52	@history.author_id = self.logged_in_user.id if self.logged_in_user	56	@history.author_id = self.logged_in_user.id if self.logged_in_user
53		57	@issue.status = @history.status
54	if @history.save	58	@issue.fixed_version_id = (params[:issue][:fixed_version_id])
55	@issue.status = @history.status	59	@issue.assigned_to_id = (params[:issue][:assigned_to_id])
56	@issue.~~fixed~~_version~~_id~~ = (params[:issue][:~~fixed~~_version~~_id~~])	60	@issue.lock_version = (params[:issue][:lock_version])
57	@issue.assigned_to_id = (params[:issue][:assigned_to_id])	61	if @issue.save
58	if @issue.save	62	flash[:notice] = l(:notice_successful_update)
59	flash[:notice] = l(:notice_successful_update)	63	Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
60	Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?	64	redirect_to :action => 'show', :id => @issue
61	redirect_to :action => 'show', :id => @issue	65	end
62	end	66	rescue ActiveRecord::StaleObjectError
63	end	67	# Optimistic locking exception
64	end	68	flash[:notice] = l(:notice_locking_conflict)
		69	end
		70	end
65	@assignable_to = @project.members.find(:all, :include => :user).collect{ \|m\| m.user }	71	@assignable_to = @project.members.find(:all, :include => :user).collect{ \|m\| m.user }
66		72	end
67	end	73
68		74	def destroy
69	def destroy	75	@issue.destroy
70	@issue.destroy	76	redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
71	redirect_to :controller => 'projects', :action => 'list_issues', :id => @project	77	end
72	end	78
73
74	def add_attachment	79	def add_attachment
75	# Save the attachment	80	# Save the attachment
76	if params[:attachment][:file].size > 0	81	if params[:attachment][:file].size > 0
@@ -94,7 +99,7 class IssuesController < ApplicationController
94		99
95	private	100	private
96	def find_project	101	def find_project
97	@issue = Issue.find(params[:id])	102	@issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
98	@project = @issue.project	103	@project = @issue.project
99	end	104	end
100	end	105	end

redmine/app/views/issues/change_status.rhtml +2 -1

             <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 +1 -1

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

redmine/app/views/issues/show.rhtml +1 -1

             <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 +2 -1

                   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 "lock_version", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end

redmine/lang/de.yml +1 0

             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 +1 0

             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 +1 0

             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 +1 0

             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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages