mirror of
https://github.com/redmine/redmine.git
synced 2025-12-24 01:10:38 +01:00
Applied the flash notices patch by Matt Jones (slightly edited).
flash[:notice] and flash[:error] are now used for notice/error messages. git-svn-id: http://redmine.rubyforge.org/svn/trunk@600 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -69,7 +69,7 @@ class IssuesController < ApplicationController
|
||||
end
|
||||
rescue ActiveRecord::StaleObjectError
|
||||
# Optimistic locking exception
|
||||
flash[:notice] = l(:notice_locking_conflict)
|
||||
flash[:error] = l(:notice_locking_conflict)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -118,7 +118,7 @@ class IssuesController < ApplicationController
|
||||
end
|
||||
rescue ActiveRecord::StaleObjectError
|
||||
# Optimistic locking exception
|
||||
flash[:notice] = l(:notice_locking_conflict)
|
||||
flash[:error] = l(:notice_locking_conflict)
|
||||
end
|
||||
end
|
||||
@assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
|
||||
|
||||
Reference in New Issue
Block a user