jro_apps/redmine Commit - r1182:bbe8ea29e8d3

0

app/controllers/projects_controller.rb +6 -17

@@ -218,25 +218,14 class ProjectsController < ApplicationController
218	end	218	end
219		219
220	def activity	220	def activity
221	if params[:year] and params[:year].to_i > 1900	221	@days = Setting.activity_days_default.to_i
222	@year = params[:year].to_i	222
223	if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13	223	if params[:from]
224	@month = params[:month].to_i	224	begin; @date_to = params[:from].to_date; rescue; end
225	end
226	end	225	end
227	@year \|\|= Date.today.year
228	@month \|\|= Date.today.month
229		226
230	case params[:format]	227	@date_to \|\|= Date.today + 1
231	when 'atom'	228	@date_from = @date_to - @days
232	# 30 last days
233	@date_from = Date.today - 30
234	@date_to = Date.today + 1
235	else
236	# current month
237	@date_from = Date.civil(@year, @month, 1)
238	@date_to = @date_from >> 1
239	end
240		229
241	@event_types = %w(issues news files documents changesets wiki_pages messages)	230	@event_types = %w(issues news files documents changesets wiki_pages messages)
242	@event_types.delete('wiki_pages') unless @project.wiki	231	@event_types.delete('wiki_pages') unless @project.wiki

0

app/helpers/projects_helper.rb +4 0

                                       }, options
               end
+              def format_activity_day(date)
+                date == Date.today ? l(:label_today).titleize : format_date(date)
+              end
               def format_activity_description(text)
                 h(truncate(text, 250))
               end

0

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

-            <h2><%= "#{month_name(@month)} #{@year}" %></h2>
+            <h2><%= l(:label_activity) %></h2>
             <div id="activity">
-            <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
+            <% @events_by_day.keys.sort.reverse.each do |day| %>
-            <h3><%= day_name(day.cwday) %> <%= day.day %></h3>
+            <h3><%= format_activity_day(day) %></h3>
             <dl>
             <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
               <dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
             <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
             <div style="float:left;">
-            <% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %>
+            <%= link_to_remote(('&#171; ' + l(:label_previous)),
-            <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
+                               {:update => "content", :url => params.merge(:from => @date_to - @days), :complete => 'window.scrollTo(0,0)'},
-                                {:update => "content", :url => prev_params}, {:href => url_for(prev_params)} %>
+                               {:href => url_for(params.merge(:from => @date_to - @days))}) %>
             </div>
             <div style="float:right;">
-            <% next_params = params.clone.update :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) %>
+            <%= link_to_remote((l(:label_next) + ' &#187;'),
-            <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
+                               {:update => "content", :url => params.merge(:from => @date_to + @days), :complete => 'window.scrollTo(0,0)'},
-                                {:update => "content", :url => next_params}, {:href => url_for(next_params)} %>
+                               {:href => url_for(params.merge(:from => @date_to + @days))}) unless @date_to >= Date.today %>
             </div>
             &nbsp;
             <p class="other-formats">

0

app/views/settings/_general.rhtml +3 0

             <p><label><%= l(:setting_per_page_options) %></label>
             <%= text_field_tag 'settings[per_page_options]', Setting.per_page_options_array.join(', '), :size => 20 %><br /><em><%= l(:text_comma_separated) %></em></p>
+            <p><label><%= l(:setting_activity_days_default) %></label>
+            <%= text_field_tag 'settings[activity_days_default]', Setting.activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
             <p><label><%= l(:setting_host_name) %></label>
             <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>

0

config/settings.yml +3 0

             issues_export_limit:
               format: int
               default: 500
+            activity_days_default:
+              format: int
+              default: 30
             per_page_options:
               default: '25,50,100'
             mail_from:

0

lang/bg.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/cs.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/de.yml +1 0

             enumeration_issue_priorities: Ticket-Prioritäten
             enumeration_doc_categories: Dokumentenkategorien
             enumeration_activities: Aktivitäten (Zeiterfassung)
+            setting_activity_days_default: Days displayed on project activity

0

lang/en.yml +1 0

             setting_protocol: Protocol
             setting_per_page_options: Objects per page options
             setting_user_format: Users display format
+            setting_activity_days_default: Days displayed on project activity
             project_module_issue_tracking: Issue tracking
             project_module_time_tracking: Time tracking

0

lang/es.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/fi.yml +1 0

             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
             label_on: 'on'
+            setting_activity_days_default: Days displayed on project activity

0

lang/fr.yml +1 0

             setting_protocol: Protocole
             setting_per_page_options: Options d'objets affichés par page
             setting_user_format: Format d'affichage des utilisateurs
+            setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
             project_module_issue_tracking: Suivi des demandes
             project_module_time_tracking: Suivi du temps passé

0

lang/he.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/it.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/ja.yml +1 0

             label_optional_description: Optional description
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/ko.yml +1 0

             label_last_month: last month
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/lt.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/nl.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/pl.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/pt-br.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/pt.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/ro.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/ru.yml +1 0

             text_assign_time_entries_to_project: Прикрепить зарегистрированное время к проекту
             text_destroy_time_entries: Удалить зарегистрированное время
             text_reassign_time_entries: 'Перенести зарегистрированное время на следующую задачу:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/sr.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/sv.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/uk.yml +1 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_destroy_time_entries: Delete reported hours
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            setting_activity_days_default: Days displayed on project activity

0

lang/zh-tw.yml +1 0

             enumeration_issue_priorities: 項目優先權
             enumeration_doc_categories: 文件分類
             enumeration_activities: 活動 (time tracking)
+            setting_activity_days_default: Days displayed on project activity

0

lang/zh.yml +1 0

             enumeration_issue_priorities: 问题优先级
             enumeration_doc_categories: 文档类别
             enumeration_activities: 活动（时间跟踪）
+            setting_activity_days_default: Days displayed on project activity

0

test/functional/projects_controller_test.rb +2 -2

               end
               def test_activity
-                get :activity, :id => 1, :year => 2.days.ago.to_date.year, :month => 2.days.ago.to_date.month
+                get :activity, :id => 1
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                              }
                            }
-                get :activity, :id => 1, :year => 3.days.ago.to_date.year, :month => 3.days.ago.to_date.month
+                get :activity, :id => 1, :from => 3.days.ago.to_date
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)

	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