diff options
| author | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2011-06-13 19:43:40 +0000 |
|---|---|---|
| committer | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2011-06-13 19:43:40 +0000 |
| commit | d5cc7424a815a68a21ea080827f737d00b18e88e (patch) | |
| tree | b858b5c0b36a152d82bbdd2a1acc33086373a8f2 /app/controllers/issues_controller.rb | |
| parent | bbf1ae581eb90cd516f33d245248b4d394abcf86 (diff) | |
| download | redmine-d5cc7424a815a68a21ea080827f737d00b18e88e.tar.gz redmine-d5cc7424a815a68a21ea080827f737d00b18e88e.zip | |
Do not show inactive issue priorities where not necessary (#8573).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6070 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/issues_controller.rb')
| -rw-r--r-- | app/controllers/issues_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 63ee316a3..648848e9b 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -115,7 +115,7 @@ class IssuesController < ApplicationController @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? } @allowed_statuses = @issue.new_statuses_allowed_to(User.current) @edit_allowed = User.current.allowed_to?(:edit_issues, @project) - @priorities = IssuePriority.all + @priorities = IssuePriority.active @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) respond_to do |format| format.html { render :template => 'issues/show.rhtml' } @@ -279,7 +279,7 @@ private # 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.all + @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] @@ -315,7 +315,7 @@ private @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] end end - @priorities = IssuePriority.all + @priorities = IssuePriority.active @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true) end |