jro_apps/redmine Commit - r1999:d63746ab3e41

Fixes activity date param....

Jean-Philippe Lang -

r1999:d63746ab3e41

parent child

Context file:

r1999:d63746ab3e41

Collapse all files

app/controllers/projects_controller.rb +1 -1

                 @days = Setting.activity_days_default.to_i
                 if params[:from]
-                  begin; @date_to = params[:from].to_date; rescue; end
+                  begin; @date_to = params[:from].to_date + 1; rescue; end
                 end
                 @date_to ||= Date.today + 1

app/views/projects/activity.rhtml +4 -4

             <div style="float:left;">
             <%= link_to_remote(('&#171; ' + l(:label_previous)),
-                               {:update => "content", :url => params.merge(:from => @date_to - @days), :complete => 'window.scrollTo(0,0)'},
+                               {:update => "content", :url => params.merge(:from => @date_to - @days - 1), :complete => 'window.scrollTo(0,0)'},
-                               {:href => url_for(params.merge(:from => @date_to - @days)),
+                               {:href => url_for(params.merge(:from => @date_to - @days - 1)),
                                 :title => "#{l(:label_date_from)} #{format_date(@date_to - 2*@days)} #{l(:label_date_to).downcase} #{format_date(@date_to - @days - 1)}"}) %>
             </div>
             <div style="float:right;">
             <%= link_to_remote((l(:label_next) + ' &#187;'),
-                               {:update => "content", :url => params.merge(:from => @date_to + @days), :complete => 'window.scrollTo(0,0)'},
+                               {:update => "content", :url => params.merge(:from => @date_to + @days - 1), :complete => 'window.scrollTo(0,0)'},
-                               {:href => url_for(params.merge(:from => @date_to + @days)),
+                               {:href => url_for(params.merge(:from => @date_to + @days - 1)),
                                 :title => "#{l(:label_date_from)} #{format_date(@date_to)} #{l(:label_date_to).downcase} #{format_date(@date_to + @days - 1)}"}) unless @date_to >= Date.today %>
             </div>
             &nbsp;

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