Move some action links for issues and journals to the dropdown menu (#34714).

Patch by Mizuki ISHIKAWA.

git-svn-id: http://svn.redmine.org/redmine/trunk@20765 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index d947f823329f5c4f18f2a634dcab2e39946d9113..a6cb9763225d3d03a9ee5f4941f8f1c39855c449 100644 (file)
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -28,6 +28,7 @@ module JournalsHelper
   # Returns the action links for an issue journal
   def render_journal_actions(issue, journal, options={})
     links = []
+    dropbown_links = []
     if journal.notes.present?
       if options[:reply_links]
         indice = journal.indice || @journal.issue.visible_journals_with_index.find{|j| j.id == @journal.id}.indice
@@ -47,16 +48,15 @@ module JournalsHelper
                          :title => l(:button_edit),
                          :class => 'icon-only icon-edit'
                         )
-        links << link_to(l(:button_delete),
-                         journal_path(journal, :journal => {:notes => ""}),
-                         :remote => true,
-                         :method => 'put', :data => {:confirm => l(:text_are_you_sure)},
-                         :title => l(:button_delete),
-                         :class => 'icon-only icon-del'
-                        )
+        dropbown_links << link_to(l(:button_delete),
+                                  journal_path(journal, :journal => {:notes => ""}),
+                                  :remote => true,
+                                  :method => 'put', :data => {:confirm => l(:text_are_you_sure)},
+                                  :class => 'icon icon-del'
+                                 )
       end
     end
-    safe_join(links, ' ')
+    safe_join(links, ' ') + actions_dropdown {safe_join(dropbown_links, ' ')}
   end
 
   def render_notes(issue, journal, options={})

diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index bd7bcc05fcc5844e8f11da41ca5333c77cd8ff40..93e5bad6335a8be2bcd5472a6d498ff34ec9c5d5 100644 (file)
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -5,9 +5,11 @@
 <%= link_to l(:button_log_time), new_issue_time_entry_path(@issue),
             :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
 <%= watcher_link(@issue, User.current) %>
-<%= link_to l(:button_copy), project_copy_issue_path(@project, @issue),
-            :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
-<%= link_to l(:button_delete), issue_path(@issue),
-            :data => {:confirm => issues_destroy_confirmation_message(@issue)},
-            :method => :delete, :class => 'icon icon-del' if @issue.deletable? %>
+<%= actions_dropdown do %>
+  <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue),
+              :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
+  <%= link_to l(:button_delete), issue_path(@issue),
+              :data => {:confirm => issues_destroy_confirmation_message(@issue)},
+              :method => :delete, :class => 'icon icon-del' if @issue.deletable? %>
+<% end %>
 </div>

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index a8296b9bc37f27a897104050b7c4e7988cd4407d..91d11c6c89ecf7e74cb5829e051ff5d0354de314 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -2072,6 +2072,13 @@ class IssuesControllerTest < Redmine::ControllerTest
     get(:show, :params => {:id => 1})
     assert_response :success
     assert_select 'div.issue div.description', :text => /Unable to print recipes/
+    assert_select '.contextual' do
+      assert_select 'a', {:count => 2, :text => /Edit/}
+      assert_select 'a', {:count => 0, :text => /Log time/}
+      assert_select 'a', {:count => 0, :text => /Watch/}
+      assert_select 'div.drdn-items a', {:count => 0, :text => /Copy/}
+      assert_select 'div.drdn-items a', {:count => 0, :text => /Delete/}
+    end
     # anonymous role is allowed to add a note
     assert_select 'form#issue-form' do
       assert_select 'fieldset' do
@@ -2086,6 +2093,13 @@ class IssuesControllerTest < Redmine::ControllerTest
     @request.session[:user_id] = 2
     get(:show, :params => {:id => 1})
     assert_select 'a', :text => /Quote/
+    assert_select '.contextual' do
+      assert_select 'a', {:count => 2, :text => /Edit/}
+      assert_select 'a', :text => /Log time/
+      assert_select 'a', :text => /Watch/
+      assert_select 'div.drdn-items a', :text => /Copy/
+      assert_select 'div.drdn-items a', :text => /Delete/
+    end
     assert_select 'form#issue-form' do
       assert_select 'fieldset' do
         assert_select 'legend', :text => 'Change properties'

diff --git a/test/helpers/journals_helper_test.rb b/test/helpers/journals_helper_test.rb
index a3475c6ab944eb2fc2c16dfbbe09916f6400ca95..218b9498a7c9d9e7546f9a5abb0e435ceae0cd63 100644 (file)
--- a/test/helpers/journals_helper_test.rb
+++ b/test/helpers/journals_helper_test.rb
@@ -22,7 +22,7 @@ require File.expand_path('../../test_helper', __FILE__)
 class JournalsHelperTest < Redmine::HelperTest
   include JournalsHelper
 
-  fixtures :projects, :trackers, :issue_statuses, :issues,
+  fixtures :projects, :trackers, :issue_statuses, :issues, :journals,
            :enumerations, :issue_categories,
            :projects_trackers,
            :users, :roles, :member_roles, :members,
@@ -49,4 +49,15 @@ class JournalsHelperTest < Redmine::HelperTest
     assert_kind_of Attachment, thumbnails.first
     assert_equal 'image.png', thumbnails.first.filename
   end
+
+  def test_render_journal_actions_should_return_edit_link_and_actions_dropdown
+    User.current = User.find(1)
+    issue = Issue.find(1)
+    journals = issue.visible_journals_with_index # add indice
+    journal_actions = render_journal_actions(issue, journals.first, {reply_links: true})
+
+    assert_select_in journal_actions, 'a[title=?][class="icon-only icon-comment"]', 'Quote'
+    assert_select_in journal_actions, 'a[title=?][class="icon-only icon-edit"]', 'Edit'
+    assert_select_in journal_actions, 'div[class="drdn-items"] a[class="icon icon-del"]'
+  end
 end