diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-02-09 19:34:56 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-02-09 19:34:56 +0000 |
| commit | 07a93c2731c5c68c0c64da3aeffc4ee1b19e1b5a (patch) | |
| tree | 4f2c5c57c0bbf0eb1e1ef1d80d77082518219d3b | |
| parent | 5e0c1cc5ce9e16f3b4d8d2066bc1c4023afdee78 (diff) | |
| download | redmine-07a93c2731c5c68c0c64da3aeffc4ee1b19e1b5a.tar.gz redmine-07a93c2731c5c68c0c64da3aeffc4ee1b19e1b5a.zip | |
Only show allowed statuses in context menu (#10181).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8825 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/context_menus_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/context_menus/issues.html.erb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb index 007cc38e6..46eba1abf 100644 --- a/app/controllers/context_menus_controller.rb +++ b/app/controllers/context_menus_controller.rb @@ -39,7 +39,6 @@ class ContextMenusController < ApplicationController end @priorities = IssuePriority.active.reverse - @statuses = IssueStatus.find(:all, :order => 'position') @back = back_url @options_by_custom_field = {} diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb index 375758484..b621db003 100644 --- a/app/views/context_menus/issues.html.erb +++ b/app/views/context_menus/issues.html.erb @@ -13,9 +13,9 @@ <li class="folder"> <a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a> <ul> - <% @statuses.each do |s| -%> + <% @allowed_statuses.each do |s| -%> <li><%= context_menu_link h(s.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {:status_id => s}, :back_url => @back}, :method => :post, - :selected => (@issue && s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %></li> + :selected => (@issue && s == @issue.status), :disabled => !@can[:update] %></li> <% end -%> </ul> </li> |