Merged r22085 from trunk to 4.2-stable (#38217).

git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@22090 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index ded912cc480d1325edcf5fd3a6803198ea02b5b3..4f2a760729e488b070a95ea4dc02958bb730e521 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -679,8 +679,8 @@ module IssuesHelper
   def issue_history_tabs
     tabs = []
     if @journals.present?
-      journals_without_notes = @journals.select{|value| value.notes.blank?}
-      journals_with_notes = @journals.reject{|value| value.notes.blank?}
+      has_details = @journals.any? {|value| value.details.present?}
+      has_notes = @journals.any? {|value| value.notes.present?}
       tabs <<
         {
           :name => 'history',
@@ -689,7 +689,7 @@ module IssuesHelper
           :partial => 'issues/tabs/history',
           :locals => {:issue => @issue, :journals => @journals}
         }
-      if journals_with_notes.any?
+      if has_notes
         tabs <<
           {
             :name => 'notes',
@@ -697,7 +697,7 @@ module IssuesHelper
             :onclick => 'showIssueHistory("notes", this.href)'
           }
       end
-      if journals_without_notes.any?
+      if has_details
         tabs <<
           {
             :name => 'properties',

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index bc5f31caa0738e4bd020d21743761ad6640ddf66..9f9f81682a612cdf2f2ba82e64ef15adbeab2ab9 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -3049,7 +3049,7 @@ class IssuesControllerTest < Redmine::ControllerTest
   def test_show_display_only_all_and_notes_tabs_for_issue_with_notes_only
     @request.session[:user_id] = 1
 
-    get :show, :params => {:id => 6}
+    get :show, :params => {:id => 14}
     assert_response :success
     assert_select '#history' do
       assert_select 'div.tabs ul a', 2
@@ -3080,13 +3080,6 @@ class IssuesControllerTest < Redmine::ControllerTest
 
   def test_show_display_all_notes_and_history_tabs_for_issue_with_notes_and_history_changes
     journal = Journal.create!(:journalized => Issue.find(6), :user_id => 1)
-    detail =
-      JournalDetail.
-        create!(
-          :journal => journal, :property => 'attr',
-          :prop_key => 'description',
-          :old_value => 'Foo', :value => 'Bar'
-        )
     @request.session[:user_id] = 1
 
     get :show, :params => {:id => 6}