jro_apps/redmine Commit - r15755:84732abd0ad7

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

Jean-Philippe Lang -

r15755:84732abd0ad7

parent child

Context file:

r15755:84732abd0ad7

Collapse all files

app/views/activities/index.html.erb +1 -1

             <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2>
             <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
             <div id="activity">
             <% @events_by_day.keys.sort.reverse.each do |day| %>
             <h3><%= format_activity_day(day) %></h3>
             <dl>
             <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
               <dt class="<%= e.event_type %> icon icon-<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
               <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
               <span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', e.project, :class => 'project') if @project.nil? || @project != e.project %>
               <%= link_to format_activity_title(e.event_title), e.event_url %>
               </dt>
               <dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span>
               <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
             <% end -%>
             </dl>
             <% end -%>
             </div>
             <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
             <span class="pagination">
               <ul class="pages">
                 <li class="previous page">
             <%= link_to("\xc2\xab " + l(:label_previous),
                                {: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)),
                                :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",
                                {: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)),
                                :accesskey => accesskey(:next)) %><% end %>
                 </li>
               </ul>
             </span>
             &nbsp;
             <% other_formats_links do |f| %>
               <%= f.link_to_with_query_parameters 'Atom', 'from' => nil, :key => User.current.rss_key %>
             <% end %>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, :params => request.query_parameters.merge(:from => nil, :key => User.current.rss_key), :format => 'atom') %>
             <% end %>
             <% content_for :sidebar do %>
             <%= form_tag({}, :method => :get, :id => 'activity_scope_form') do %>
             <h3><%= l(:label_activity) %></h3>
             <ul>
             <% @activity.event_types.each do |t| %>
               <li>
                 <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
                 <label for="show_<%=t%>">
                   <%= link_to(l("label_#{t.singularize}_plural"),
                               {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%>
                 </label>
               </li>
             <% end %>
             </ul>
             <% if @project && @project.descendants.active.any? %>
                 <%= hidden_field_tag 'with_subprojects', 0, :id => nil %>
                 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
             <% end %>
             <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
             <%= hidden_field_tag('from', params[:from]) unless params[:from].blank? %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => 'submit' %></p>
             <% end %>
             <% end %>
             <% html_title(l(:label_activity), @author) -%>

test/functional/activities_controller_test.rb +18 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class ActivitiesControllerTest < Redmine::ControllerTest
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :groups_users,
                        :enabled_modules,
                        :journals, :journal_details
               def test_project_index
                 get :index, :id => 1, :with_subprojects => 0
                 assert_response :success
                 assert_select 'h3', :text => /#{2.days.ago.to_date.day}/
                 assert_select 'dl dt.issue-edit a', :text => /(#{IssueStatus.find(2).name})/
               end
               def test_project_index_with_invalid_project_id_should_respond_404
                 get :index, :id => 299
                 assert_response 404
               end
               def test_previous_project_index
                 get :index, :id => 1, :from => 2.days.ago.to_date
                 assert_response :success
                 assert_select 'h3', :text => /#{3.days.ago.to_date.day}/
                 assert_select 'dl dt.issue a', :text => /Cannot print recipes/
               end
               def test_global_index
                 @request.session[:user_id] = 1
                 get :index
                 assert_response :success
                 i5 = Issue.find(5)
                 d5 = User.find(1).time_to_date(i5.created_on)
                 assert_select 'h3', :text => /#{d5.day}/
                 assert_select 'dl dt.issue a', :text => /Subproject issue/
               end
               def test_user_index
                 @request.session[:user_id] = 1
                 get :index, :user_id => 2
                 assert_response :success
                 assert_select 'h2 a[href="/users/2"]', :text => 'John Smith'
                 i1 = Issue.find(1)
                 d1 = User.find(1).time_to_date(i1.created_on)
                 assert_select 'h3', :text => /#{d1.day}/
                 assert_select 'dl dt.issue a', :text => /Cannot print recipes/
               end
               def test_user_index_with_invalid_user_id_should_respond_404
                 get :index, :user_id => 299
                 assert_response 404
               end
               def test_index_atom_feed
                 get :index, :format => 'atom', :with_subprojects => 0
                 assert_response :success
                 assert_select 'feed' do
                   assert_select 'link[rel=self][href=?]', 'http://test.host/activity.atom?with_subprojects=0'
                   assert_select 'link[rel=alternate][href=?]', 'http://test.host/activity?with_subprojects=0'
                   assert_select 'entry' do
                     assert_select 'link[href=?]', 'http://test.host/issues/11'
                   end
                 end
               end
               def test_index_atom_feed_with_explicit_selection
                 get :index, :format => 'atom', :with_subprojects => 0,
                   :show_changesets => 1,
                   :show_documents => 1,
                   :show_files => 1,
                   :show_issues => 1,
                   :show_messages => 1,
                   :show_news => 1,
                   :show_time_entries => 1,
                   :show_wiki_edits => 1
                 assert_response :success
                 assert_select 'feed' do
                   assert_select 'link[rel=self][href=?]', 'http://test.host/activity.atom?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_time_entries=1&show_wiki_edits=1&with_subprojects=0'
                   assert_select 'link[rel=alternate][href=?]', 'http://test.host/activity?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_time_entries=1&show_wiki_edits=1&with_subprojects=0'
                   assert_select 'entry' do
                     assert_select 'link[href=?]', 'http://test.host/issues/11'
                   end
                 end
               end
               def test_index_atom_feed_with_one_item_type
                 with_settings :default_language => 'en' do
                   get :index, :format => 'atom', :show_issues => '1'
                   assert_response :success
                   assert_select 'title', :text => /Issues/
                 end
               end
               def test_index_atom_feed_with_user
                 get :index, :user_id => 2, :format => 'atom'
                 assert_response :success
                 assert_select 'title', :text => "Redmine: #{User.find(2).name}"
               end
               def test_index_should_show_private_notes_with_permission_only
                 journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes', :private_notes => true)
                 @request.session[:user_id] = 2
                 get :index
                 assert_response :success
                 assert_select 'dl', :text => /Private notes/
                 Role.find(1).remove_permission! :view_private_notes
                 get :index
                 assert_response :success
                 assert_select 'dl', :text => /Private notes/, :count => 0
               end
               def test_index_with_submitted_scope_should_save_as_preference
                 @request.session[:user_id] = 2
                 get :index, :show_issues => '1', :show_messages => '1', :submit => 'Apply'
                 assert_response :success
                 assert_equal %w(issues messages), User.find(2).pref.activity_scope.sort
               end
               def test_index_scope_should_default_to_user_preference
                 pref = User.find(2).pref
                 pref.activity_scope = %w(issues news)
                 pref.save!
                 @request.session[:user_id] = 2
                 get :index
                 assert_response :success
                 assert_select '#activity_scope_form' do
                   assert_select 'input[checked=checked]', 2
                   assert_select 'input[name=show_issues][checked=checked]'
                   assert_select 'input[name=show_news][checked=checked]'
                 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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages