meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 23:11:12 +00:00
Code Issues Releases Wiki Activity

Missing "next" pagination link when looking at yesterday's activity (#18399).

Browse Source 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16137 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-01-04 21:13:28 +00:00
parent 1c44b16023
commit 84732abd0a
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/activities/index.html.erb
View File

@ -28,7 +28,7 @@
{:params => request.query_parameters.merge(:from => @date_to - @days - 1)}, {:params => request.query_parameters.merge(:from => @date_to - @days - 1)},
:title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1)), :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1)),
:accesskey => accesskey(:previous)) %> :accesskey => accesskey(:previous)) %>
</li><% unless @date_to >= User.current.today %><li class="next page"> </li><% unless @date_to > User.current.today %><li class="next page">
<%= link_to(l(:label_next) + " \xc2\xbb", <%= link_to(l(:label_next) + " \xc2\xbb",
{:params => request.query_parameters.merge(:from => @date_to + @days - 1)}, {:params => request.query_parameters.merge(:from => @date_to + @days - 1)},
:title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1)), :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1)),

18
test/functional/activities_controller_test.rb
View File

@ -169,4 +169,22 @@ class ActivitiesControllerTest < Redmine::ControllerTest
assert_select 'input[name=show_news][checked=checked]' assert_select 'input[name=show_news][checked=checked]'
end end
end end
def test_index_should_not_show_next_page_link
@request.session[:user_id] = 2
get :index
assert_response :success
assert_select '.pagination a', :text => /Previous/
assert_select '.pagination a', :text => /Next/, :count => 0
end
def test_index_up_to_yesterday_should_show_next_page_link
@request.session[:user_id] = 2
get :index, :from => (User.find(2).today-1)
assert_response :success
assert_select '.pagination a', :text => /Previous/
assert_select '.pagination a', :text => /Next/
end
end end