summaryrefslogtreecommitdiffstats
path: root/app/views/activities
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-06-30 20:14:49 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-06-30 20:14:49 +0000
commitaadddc9427b4f5709432701162fad36ac9022e28 (patch)
treeff112af0bb6bd9b9364de27d051758e525729b49 /app/views/activities
parent1310f0afa9f731ea7f7678f9e7c6320ef841f26b (diff)
downloadredmine-aadddc9427b4f5709432701162fad36ac9022e28.tar.gz
redmine-aadddc9427b4f5709432701162fad36ac9022e28.zip
Don't render an empty li tag (#23192).
git-svn-id: http://svn.redmine.org/redmine/trunk@15597 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/activities')
-rw-r--r--app/views/activities/index.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index f1a25e664..748e60fd1 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -28,11 +28,11 @@
params.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><li class="next page">
+ </li><% unless @date_to >= User.current.today %><li class="next page">
<%= link_to_content_update(l(:label_next) + " \xc2\xbb",
params.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)) unless @date_to >= User.current.today %>
+ :accesskey => accesskey(:next)) %><% end %>
</li>
</ul>
</span>