From: Jean-Philippe Lang Date: Wed, 13 Jul 2016 18:34:45 +0000 (+0000) Subject: Adds a link to spent time on version details (#13558). X-Git-Tag: 3.4.0~815 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=abf3fe9c83d8e0e832d4e4d211eafbeb27ea72b1;p=redmine.git Adds a link to spent time on version details (#13558). git-svn-id: http://svn.redmine.org/redmine/trunk@15648 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb index 27e70aab4..f018c2d8e 100644 --- a/app/views/versions/show.html.erb +++ b/app/views/versions/show.html.erb @@ -22,7 +22,8 @@ <% if User.current.allowed_to_view_all_time_entries?(@project) %> <%= l(:label_spent_time) %> - <%= html_hours(l_hours(@version.spent_hours)) %> + <%= link_to html_hours(l_hours(@version.spent_hours)), + project_time_entries_path(@version.project, :set_filter => 1, :"issue.fixed_version_id" => @version.id) %> <% end %> diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb index 185afe263..f44a4093a 100644 --- a/test/functional/versions_controller_test.rb +++ b/test/functional/versions_controller_test.rb @@ -20,7 +20,7 @@ require File.expand_path('../../test_helper', __FILE__) class VersionsControllerTest < ActionController::TestCase fixtures :projects, :versions, :issues, :users, :roles, :members, :member_roles, :enabled_modules, :issue_statuses, - :issue_categories + :issue_categories, :enumerations def setup User.current = nil @@ -98,6 +98,18 @@ class VersionsControllerTest < ActionController::TestCase assert_select 'h2', :text => /1.0/ end + def test_show_should_link_to_spent_time_on_version + version = Version.generate! + issue = Issue.generate(:fixed_version => version) + TimeEntry.generate!(:issue => issue, :hours => 7.2) + + get :show, :id => version.id + assert_response :success + + assert_select '.total-hours', :text => '7.20 hours' + assert_select '.total-hours a[href=?]', "/projects/ecookbook/time_entries?issue.fixed_version_id=#{version.id}&set_filter=1" + end + def test_show_should_display_nil_counts with_settings :default_language => 'en' do get :show, :id => 2, :status_by => 'category'