Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-04-03 02:59:33 +02:00
Code Issues Packages Projects Releases Activity

Merged r19702 and r19703 from trunk to 4.1-stable (#33273).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19704 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-04-15 14:24:04 +00:00
parent bea335bec7
commit 8eeafcdd5e
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/queries_helper.rb
View File

@@ -167,7 +167,7 @@ module QueriesHelper
def total_tag(column, value)
label = content_tag('span', "#{column.caption}:")
value =
if [:hours, :spent_hours, :total_spent_hours, :estimated_hours].include? column.name
if [:hours, :spent_hours, :total_spent_hours, :estimated_hours, :total_estimated_hours].include? column.name
format_hours(value)
else
format_object(value)
@@ -238,7 +238,7 @@ module QueriesHelper
'span',
value.to_s(item) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe,
:class => value.css_classes_for(item))
when :hours, :estimated_hours
when :hours, :estimated_hours, :total_estimated_hours
format_hours(value)
when :spent_hours
link_to_if(value > 0, format_hours(value), project_time_entries_path(item.project, :issue_id => "#{item.id}"))

16
test/functional/issues_controller_test.rb
View File

@@ -1720,6 +1720,22 @@ class IssuesControllerTest < Redmine::ControllerTest
end
end
def test_index_should_respect_timespan_format
with_settings :timespan_format => 'minutes' do
get(
:index,
:params => {
:set_filter => 1,
:c => %w(estimated_hours total_estimated_hours spent_hours total_spent_hours)
}
)
assert_select 'table.issues tr#issue-1 td.estimated_hours', :text => '200:00'
assert_select 'table.issues tr#issue-1 td.total_estimated_hours', :text => '200:00'
assert_select 'table.issues tr#issue-1 td.spent_hours', :text => '154:15'
assert_select 'table.issues tr#issue-1 td.total_spent_hours', :text => '154:15'
end
end
def test_show_by_anonymous
get :show, :params => {
:id => 1