meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22089 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2023-02-03 00:58:04 +00:00
parent a19978cf83
commit e6c2bea2f9
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/issues_helper.rb
View File

@ -693,8 +693,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',
@ -703,7 +703,7 @@ module IssuesHelper
:partial => 'issues/tabs/history',
:locals => {:issue => @issue, :journals => @journals}
}
if journals_with_notes.any?
if has_notes
tabs <<
{
:name => 'notes',
@ -711,7 +711,7 @@ module IssuesHelper
:onclick => 'showIssueHistory("notes", this.href)'
}
end
if journals_without_notes.any?
if has_details
tabs <<
{
:name => 'properties',

9
test/functional/issues_controller_test.rb
View File

@ -3068,7 +3068,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
@ -3099,13 +3099,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}