Removed the "Move" button for single issue since it can be moved from the reguler...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8533 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index 0eac74d414408cc5111a9e6ebc1e08a1856f9009..ee58599d318df6cd3a4e83a37a09f0d50e2ef69c 100644 (file)
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -112,8 +112,10 @@
 <% end %>
   <li><%= context_menu_link l(:button_copy), new_issue_move_path(:ids => @issues.collect(&:id), :copy_options => {:copy => 't'}),
                           :class => 'icon-copy', :disabled => !@can[:move]  %></li>
+<% unless @issue.present? %>
   <li><%= context_menu_link l(:button_move), new_issue_move_path(:ids => @issues.collect(&:id)),
                           :class => 'icon-move', :disabled => !@can[:move]  %></li>
+<% end %>
   <li><%= context_menu_link l(:button_delete), issues_path(:ids => @issues.collect(&:id), :back_url => @back),
                             :method => :delete, :confirm => issues_destroy_confirmation_message(@issues), :class => 'icon-del', :disabled => !@can[:delete] %></li>
 

diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index acbeb361708a3a0c67b02a5305cc861756a4b134..9360960ded5f4e8f2d9206349972b511bd866d1a 100644 (file)
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -4,6 +4,5 @@
 <%= watcher_tag(@issue, User.current) %>
 <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
 <%= link_to_if_authorized l(:button_copy), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %>
-<%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %>
 <%= link_to l(:button_delete), issue_path(@issue), :confirm => issues_destroy_confirmation_message(@issue), :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %>
 </div>

diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb
index 85011f8197e8fc7c3f08a8eeee67c9b4d08a420f..020f71163a4f67eaca26351f50a070df76b0b10e 100644 (file)
--- a/test/functional/context_menus_controller_test.rb
+++ b/test/functional/context_menus_controller_test.rb
@@ -49,9 +49,7 @@ class ContextMenusControllerTest < ActionController::TestCase
     assert_tag :tag => 'a', :content => 'Copy',
                             :attributes => { :href => '/issues/move/new?copy_options%5Bcopy%5D=t&amp;ids%5B%5D=1',
                                              :class => 'icon-copy' }
-    assert_tag :tag => 'a', :content => 'Move',
-                            :attributes => { :href => '/issues/move/new?ids%5B%5D=1',
-                                             :class => 'icon-move' }
+    assert_no_tag :tag => 'a', :content => 'Move'
     assert_tag :tag => 'a', :content => 'Delete',
                             :attributes => { :href => '/issues?ids%5B%5D=1',
                                              :class => 'icon-del' }