diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2c9a441c9..284ac5655 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -446,13 +446,15 @@ class ProjectsController < ApplicationController @date_to = @date_from >> 1 end - @event_types = %w(issues news attachments documents wiki_edits revisions) - @event_types.delete('wiki_edits') unless @project.wiki + @event_types = %w(issues news files documents wiki_pages changesets) + @event_types.delete('wiki_pages') unless @project.wiki @event_types.delete('changesets') unless @project.repository + # only show what the user is allowed to view + @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)} @scope = @event_types.select {|t| params["show_#{t}"]} # default events if none is specified in parameters - @scope = (@event_types - %w(wiki_edits))if @scope.empty? + @scope = (@event_types - %w(wiki_pages))if @scope.empty? @events = [] @@ -464,7 +466,7 @@ class ProjectsController < ApplicationController @events += @project.news.find(:all, :conditions => ["#{News.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author ) end - if @scope.include?('attachments') + if @scope.include?('files') @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author ) end @@ -473,7 +475,7 @@ class ProjectsController < ApplicationController @events += Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author ) end - if @scope.include?('wiki_edits') && @project.wiki + if @scope.include?('wiki_pages') select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " + "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " + "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " + @@ -486,7 +488,7 @@ class ProjectsController < ApplicationController @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions) end - if @scope.include?('revisions') && @project.repository + if @scope.include?('changesets') @events += @project.repository.changesets.find(:all, :conditions => ["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to]) end diff --git a/lang/bg.yml b/lang/bg.yml index d557f0f6b..419318604 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -509,3 +509,5 @@ default_activity_development: Разработка enumeration_issue_priorities: Приоритети на задачи enumeration_doc_categories: Категории документи enumeration_activities: Дейности (time tracking) +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/de.yml b/lang/de.yml index feb004142..875639e90 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -509,3 +509,5 @@ default_activity_development: Development enumeration_issue_priorities: Ticket-Prioritäten enumeration_doc_categories: Dokumentenkategorien enumeration_activities: Aktivitäten (Zeiterfassung) +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/en.yml b/lang/en.yml index fb7cfb403..4b3537f0a 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -420,6 +420,8 @@ label_module_plural: Modules label_added_time_by: Added by %s %s ago label_updated_time: Updated %s ago label_jump_to_a_project: Jump to a project... +label_file_plural: Files +label_changeset_plural: Changesets button_login: Login button_submit: Submit diff --git a/lang/es.yml b/lang/es.yml index 646b35395..7b6253044 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -509,3 +509,5 @@ default_activity_development: Development enumeration_issue_priorities: Prioridad de las peticiones enumeration_doc_categories: Categorías del documento enumeration_activities: Activities (time tracking) +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/fr.yml b/lang/fr.yml index d98353ef3..d6b7fb4e7 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -420,6 +420,8 @@ label_module_plural: Modules label_added_time_by: Ajouté par %s il y a %s label_updated_time: Mis à jour il y a %s label_jump_to_a_project: Aller à un projet... +label_file_plural: Fichiers +label_changeset_plural: Révisions button_login: Connexion button_submit: Soumettre diff --git a/lang/it.yml b/lang/it.yml index b1d8c85a9..09c320ced 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -509,3 +509,5 @@ default_activity_development: Development enumeration_issue_priorities: Priorità contesti enumeration_doc_categories: Categorie di documenti enumeration_activities: Attività (time tracking) +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/ja.yml b/lang/ja.yml index f4f393760..c278babaf 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -510,3 +510,5 @@ default_activity_development: 開発作業 enumeration_issue_priorities: 問題の優先度 enumeration_doc_categories: 文書カテゴリ enumeration_activities: 作業分類 (時間トラッキング) +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/nl.yml b/lang/nl.yml index 623717af9..80c6bd07a 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -510,3 +510,5 @@ enumeration_issue_priorities: Issue prioriteiten enumeration_doc_categories: Document categorieën enumeration_activities: Activiteiten (tijd tracking) text_comma_separated: Multiple values allowed (comma separated). +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/pl.yml b/lang/pl.yml index 184e33d25..101e74675 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -509,3 +509,5 @@ label_send_test_email: Send a test email button_reset: Reset label_added_time_by: Added by %s %s ago field_estimated_hours: Estimated time +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/pt-br.yml b/lang/pt-br.yml index b4f7dd3d5..a260fef83 100644 --- a/lang/pt-br.yml +++ b/lang/pt-br.yml @@ -509,3 +509,5 @@ default_activity_development: Desenvolvimento enumeration_issue_priorities: Prioridade das tarefas enumeration_doc_categories: Categorias de documento enumeration_activities: Atividades (time tracking) +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/pt.yml b/lang/pt.yml index f1ba45f66..370c02551 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -509,3 +509,5 @@ default_activity_development: Desenvolvimento enumeration_issue_priorities: Prioridade das tarefas enumeration_doc_categories: Categorias de documento enumeration_activities: Atividades (time tracking) +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/sv.yml b/lang/sv.yml index e2d86a23d..f9dae4066 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -510,3 +510,5 @@ enumeration_issue_priorities: Bristprioriteringar enumeration_doc_categories: Dokumentkategorier enumeration_activities: Aktiviteter (tidsspårning) field_comments: Comment +label_file_plural: Files +label_changeset_plural: Changesets diff --git a/lang/zh.yml b/lang/zh.yml index 0cbd27a83..b1e62f39d 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -512,3 +512,5 @@ enumeration_issue_priorities: 任务优先级 enumeration_doc_categories: 文档类别 enumeration_activities: Activities (time tracking) label_wiki_page: Wiki page +label_file_plural: Files +label_changeset_plural: Changesets