diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-18 07:39:26 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-18 07:39:26 +0000 |
| commit | 6b03c741acfced92544d536e7682b1cb43746669 (patch) | |
| tree | 33da2f703338ed9f0078775d8f45f0906b26c736 | |
| parent | 45a9b9954af188df5284d18239e05b4b162b31fc (diff) | |
| download | redmine-6b03c741acfced92544d536e7682b1cb43746669.tar.gz redmine-6b03c741acfced92544d536e7682b1cb43746669.zip | |
Adds a link on "My Page" to view all my spent time (#13157).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11859 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/my/blocks/_timelog.html.erb | 5 | ||||
| -rw-r--r-- | test/functional/timelog_controller_test.rb | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb index be8e05e35..7953ee6fe 100644 --- a/app/views/my/blocks/_timelog.html.erb +++ b/app/views/my/blocks/_timelog.html.erb @@ -1,4 +1,7 @@ -<h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3> +<h3> + <%= link_to l(:label_spent_time), time_entries_path(:user_id => 'me') %> + (<%= l(:label_last_n_days, 7) %>) +</h3> <% entries = timelog_items entries_by_day = entries.group_by(&:spent_on) diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index 7b9c9e891..2cc9bf778 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -429,6 +429,14 @@ class TimelogControllerTest < ActionController::TestCase assert_tag 'a', :attributes => {:href => '/time_entries/new'}, :content => /Log time/ end + def test_index_my_spent_time + @request.session[:user_id] = 2 + get :index, :user_id => 'me' + assert_response :success + assert_template 'index' + assert assigns(:entries).all? {|entry| entry.user_id == 2} + end + def test_index_at_project_level get :index, :project_id => 'ecookbook' assert_response :success |