summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-14 04:51:49 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-14 04:51:49 +0000
commit1feb373c8903cc71d248d47caa36bb2ac32a9aae (patch)
tree9a13ba34c1cc090032d74d195238aaaa6a8e66be /app/controllers
parent32fd503cbbdfcd8492d162bd591a98602af97c54 (diff)
downloadredmine-1feb373c8903cc71d248d47caa36bb2ac32a9aae.tar.gz
redmine-1feb373c8903cc71d248d47caa36bb2ac32a9aae.zip
Merged r9378 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9399 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/issues_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 5621fbbe8..dfec893d6 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -348,8 +348,6 @@ private
# from the params
# TODO: Refactor, not everything in here is needed by #edit
def update_issue_from_params
- @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
- @priorities = IssuePriority.active
@edit_allowed = User.current.allowed_to?(:edit_issues, @project)
@time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
@time_entry.attributes = params[:time_entry]
@@ -371,6 +369,8 @@ private
end
end
@issue.safe_attributes = issue_attributes
+ @priorities = IssuePriority.active
+ @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
true
end