kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds a link on "My Page" to view all my spent time (#13157).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11859 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-05-18 07:39:26 +00:00
parent 45a9b9954a
commit 6b03c741ac
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/my/blocks/_timelog.html.erb
View File

@ -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 = timelog_items
entries_by_day = entries.group_by(&:spent_on) entries_by_day = entries.group_by(&:spent_on)

8
test/functional/timelog_controller_test.rb
View File

@ -429,6 +429,14 @@ class TimelogControllerTest < ActionController::TestCase
assert_tag 'a', :attributes => {:href => '/time_entries/new'}, :content => /Log time/ assert_tag 'a', :attributes => {:href => '/time_entries/new'}, :content => /Log time/
end 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 def test_index_at_project_level
get :index, :project_id => 'ecookbook' get :index, :project_id => 'ecookbook'
assert_response :success assert_response :success