jro_apps/redmine Commit - r1213:624723d0cef9

Activity enhancements:...

Jean-Philippe Lang -

r1213:624723d0cef9

parent child

Context file:

r1213:624723d0cef9

Expand all files

app/controllers/projects_controller.rb +57 -23

               menu_item :settings, :only => :settings
               menu_item :issues, :only => [:changelog]
-              before_filter :find_project, :except => [ :index, :list, :add ]
+              before_filter :find_project, :except => [ :index, :list, :add, :activity ]
-              before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
+              before_filter :find_optional_project, :only => :activity
+              before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy, :activity ]
               before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
               accept_key_auth :activity, :calendar
                 @date_from = @date_to - @days
                 @event_types = %w(issues news files documents changesets wiki_pages messages)
-                @event_types.delete('wiki_pages') unless @project.wiki
+                if @project
-                @event_types.delete('changesets') unless @project.repository
+                  @event_types.delete('wiki_pages') unless @project.wiki
-                @event_types.delete('messages') unless @project.boards.any?
+                  @event_types.delete('changesets') unless @project.repository
-                # only show what the user is allowed to view
+                  @event_types.delete('messages') unless @project.boards.any?
-                @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
+                  # only show what the user is allowed to view
+                  @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
+                  @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
+                end
                 @scope = @event_types.select {|t| params["show_#{t}"]}
                 # default events if none is specified in parameters
                 @scope = (@event_types - %w(wiki_pages messages))if @scope.empty?
                 @events = []
                 if @scope.include?('issues')
-                  @events += @project.issues.find(:all, :include => [:author, :tracker], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.created_on<=?", @date_from, @date_to] )
+                  cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
-                  @events += @project.issues_status_changes(@date_from, @date_to)
+                  cond.add(["#{Issue.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+                  @events += Issue.find(:all, :include => [:project, :author, :tracker], :conditions => cond.conditions)
+                  cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
+                  cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{JournalDetail.table_name}.prop_key = 'status_id' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+                  @events += Journal.find(:all, :include => [{:issue => :project}, :details, :user], :conditions => cond.conditions)
                 end
                 if @scope.include?('news')
-                  @events += @project.news.find(:all, :conditions => ["#{News.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author )
+                  cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_news, :project => @project, :with_subprojects => @with_subprojects))
+                  cond.add(["#{News.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+                  @events += News.find(:all, :include => [:project, :author], :conditions => cond.conditions)
                 end
                 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 )
+                  cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_files, :project => @project, :with_subprojects => @with_subprojects))
+                  cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+                  @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*",
+                                                   :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                             "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id",
+                                                   :conditions => cond.conditions)
                 end
                 if @scope.include?('documents')
-                  @events += @project.documents.find(:all, :conditions => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.created_on<=?", @date_from, @date_to] )
+                  cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
-                  @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 )
+                  cond.add(["#{Document.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+                  @events += Document.find(:all, :include => :project, :conditions => cond.conditions)
+                  cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
+                  cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+                  @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*",
+                                                   :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                             "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id",
+                                                   :conditions => cond.conditions)
                 end
                 if @scope.include?('wiki_pages')
                            "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
                            "#{WikiContent.versioned_table_name}.id"
                   joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
-                          "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
+                          "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id " +
-                  conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
+                          "LEFT JOIN #{Project.table_name} ON #{Project.table_name}.id = #{Wiki.table_name}.project_id"
-                                @project.id, @date_from, @date_to]
-                  @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions)
+                  cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_wiki_pages, :project => @project, :with_subprojects => @with_subprojects))
+                  cond.add(["#{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?", @date_from, @date_to])
+                  @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => cond.conditions)
                 end
                 if @scope.include?('changesets')
-                  @events += Changeset.find(:all, :include => :repository, :conditions => ["#{Repository.table_name}.project_id = ? AND #{Changeset.table_name}.committed_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
+                  cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_changesets, :project => @project, :with_subprojects => @with_subprojects))
+                  cond.add(["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to])
+                  @events += Changeset.find(:all, :include => {:repository => :project}, :conditions => cond.conditions)
                 end
                 if @scope.include?('messages')
-                  @events += Message.find(:all,
+                  cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_messages, :project => @project, :with_subprojects => @with_subprojects))
-                                          :include => [:board, :author],
+                  cond.add(["#{Message.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
-                                          :conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
+                  @events += Message.find(:all, :include => [{:board => :project}, :author], :conditions => cond.conditions)
                 end
                 @events_by_day = @events.group_by(&:event_date)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
-                  format.atom { render_feed(@events, :title => "#{@project.name}: #{l(:label_activity)}") }
+                  format.atom { render_feed(@events, :title => "#{@project || Setting.app_title}: #{l(:label_activity)}") }
                 end
               end
                 render_404
               end
+              def find_optional_project
+                return true unless params[:id]
+                @project = Project.find(params[:id])
+                authorize
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }

app/models/attachment.rb 0 -1

               validates_length_of :disk_filename, :maximum => 255
               acts_as_event :title => :filename,
-                            :description => :filename,
                             :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id}}
               cattr_accessor :storage_path

app/models/changeset.rb +4 0

                 super
               end
+              def project
+                repository.project
+              end
               def after_create
                 scan_comment_for_issue_ids
               end

app/models/project.rb +13 -14

                 end
               end
-              # Return all issues status changes for the project between the 2 given dates
-              def issues_status_changes(from, to)
-                Journal.find(:all, :include => [:issue, :details, :user],
-                                   :conditions => ["#{Journal.table_name}.journalized_type = 'Issue'" +
-                                                   " AND #{Issue.table_name}.project_id = ?" +
-                                                   " AND #{JournalDetail.table_name}.prop_key = 'status_id'" +
-                                                   " AND #{Journal.table_name}.created_on BETWEEN ? AND ?",
-                                                   id, from, to+1])
-              end
               # returns latest created projects
               # non public projects will be returned only if user is a member of those
               def self.latest(user=nil, count=5)
                 end
               end
-              def self.allowed_to_condition(user, permission)
+              def self.allowed_to_condition(user, permission, options={})
                 statements = []
-                active_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
+                base_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
+                if options[:project]
+                  project_statement = "#{Project.table_name}.id = #{options[:project].id}"
+                  project_statement << " OR #{Project.table_name}.parent_id = #{options[:project].id}" if options[:with_subprojects]
+                  base_statement = "(#{project_statement}) AND (#{base_statement})"
+                end
                 if user.admin?
                   # no restriction
                 elsif user.logged?
                   statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
                   allowed_project_ids = user.memberships.select {|m| m.role.allowed_to?(permission)}.collect {|m| m.project_id}
                   statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
+                elsif Role.anonymous.allowed_to?(permission)
+                  # anonymous user allowed on public project
+                  statements << "#{Project.table_name}.is_public = #{connection.quoted_true}"
                 else
-                  statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.anonymous.allowed_to?(permission)
+                  # anonymous user is not authorized
+                  statements << "1=0"
                 end
-                statements.empty? ? active_statement : "(#{active_statement} AND (#{statements.join(' OR ')}))"
+                statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
               end
               def self.find(*args)

app/models/wiki_content.rb +4 0

                   end
                 end
+                def project
+                  page.project
+                end
                 # Returns the previous version or nil
                 def previous
                   @previous ||= WikiContent::Version.find(:first,

app/views/common/feed.atom.rxml +3 -2

               xml.generator(:uri => Redmine::Info.url, :version => Redmine::VERSION) { xml.text! Redmine::Info.versioned_name; }
               @items.each do |item|
                 xml.entry do
+                  url = url_for(item.event_url(:only_path => false))
                   xml.title truncate(item.event_title, 100)
-                  xml.link "rel" => "alternate", "href" => url_for(item.event_url(:only_path => false))
+                  xml.link "rel" => "alternate", "href" => url
-                  xml.id url_for(item.event_url(:only_path => false))
+                  xml.id url
                   xml.updated item.event_datetime.xmlschema
                   author = item.event_author if item.respond_to?(:author)
                   xml.author do

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

             <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>
-              <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
+              <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %> <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
               <dd><% unless e.event_description.blank? -%>
               <span class="description"><%= format_activity_description(e.event_description) %></span><br />
               <% end %>
             </p>
             <% content_for :header_tags do %>
-            <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :year => nil, :month => nil, :key => User.current.rss_key).delete_if{|k,v|k=="commit"}) %>
+            <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :year => nil, :month => nil, :key => User.current.rss_key)) %>
             <% end %>
             <% content_for :sidebar do %>
-            <% form_tag do %>
+            <% form_tag({}, :method => :get) do %>
             <h3><%= l(:label_activity) %></h3>
             <p><% @event_types.each do |t| %>
             <label><%= check_box_tag "show_#{t}", 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
             <% end %></p>
-            <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+            <% if @project && @project.active_children.any? %>
+                <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
+                <%= hidden_field_tag 'with_subprojects', 0 %>
+            <% end %>
+            <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
             <% end %>
             <% end %>

app/views/projects/list.rhtml +5 0

@@ -1,3 +1,8
		1	<div class="contextual">
		2	<%= link_to l(:label_issue_view_all), { :controller => 'issues' } %> \|
		3	<%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
		4	</div>
		5
1	<h2><%=l(:label_project_plural)%></h2>	6	<h2><%=l(:label_project_plural)%></h2>
2		7
3	<% @project_tree.keys.sort.each do \|project\| %>	8	<% @project_tree.keys.sort.each do \|project\| %>

app/views/welcome/index.rhtml +4 -1

             </div>
             <% content_for :header_tags do %>
-            <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
+            <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+                                               :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
+            <%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :key => User.current.rss_key, :format => 'atom'},
+                                               :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
             <% end %>

lang/bg.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/cs.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/da.yml +1 0

             text_reassign_time_entries: 'Reassign reported hours to this issue:'
             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
+            label_overall_activity: Overall activity

lang/de.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/en.yml +1 0

             label_last_updates_plural: %d last updated
             label_registered_on: Registered on
             label_activity: Activity
+            label_overall_activity: Overall activity
             label_new: New
             label_logged_as: Logged as
             label_environment: Environment

lang/es.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/fi.yml +1 0

             field_comments_sorting: Display comments
             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
+            label_overall_activity: Overall activity

lang/fr.yml +2 -1

             field_subproject: Sous-projet
             field_hours: Heures
             field_activity: Activité
+            label_overall_activity: Activité globale
             field_spent_on: Date
             field_identifier: Identifiant
             field_is_filter: Utilisé comme filtre
             label_start_to_end: début à fin
             label_stay_logged_in: Rester connecté
             label_disabled: désactivé
-            label_show_completed_versions: Voire les versions passées
+            label_show_completed_versions: Voir les versions passées
             label_me: moi
             label_board: Forum
             label_board_new: Nouveau forum

lang/he.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/it.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/ja.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/ko.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/lt.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/nl.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/pl.yml +1 0

             field_comments_sorting: Display comments
             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
+            label_overall_activity: Overall activity

lang/pt-br.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/pt.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/ro.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/ru.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/sr.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/sv.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/uk.yml +1 0

             label_reverse_chronological_order: In reverse chronological order
             label_preferences: Preferences
             setting_display_subprojects_issues: Display subprojects issues on main projects by default
+            label_overall_activity: Overall activity

lang/zh-tw.yml +1 0

             enumeration_issue_priorities: 項目優先權
             enumeration_doc_categories: 文件分類
             enumeration_activities: 活動 (time tracking)
+            label_overall_activity: Overall activity

lang/zh.yml +1 0

             enumeration_issue_priorities: 问题优先级
             enumeration_doc_categories: 文档类别
             enumeration_activities: 活动（时间跟踪）
+            label_overall_activity: Overall activity

lib/ar_condition.rb +1 -1

               def initialize(condition=nil)
                 @conditions = ['1=1']
-                @conditions.add(condition) if condition
+                add(condition) if condition
               end
               def add(condition)

public/stylesheets/application.css +1 0

             div#activity dt { margin-bottom: 1px; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description { font-style: italic; }
+            div#activity span.project:after { content: " -"; }
             div#roadmap fieldset.related-issues { margin-bottom: 1em; }
             div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }

test/fixtures/issues.yml +16 -2

@@ -44,9 +44,9 issues_003:
44	start_date: <%= 1.day.from_now.to_date.to_s(:db) %>	44	start_date: <%= 1.day.from_now.to_date.to_s(:db) %>
45	due_date: <%= 40.day.ago.to_date.to_s(:db) %>	45	due_date: <%= 40.day.ago.to_date.to_s(:db) %>
46	issues_004:	46	issues_004:
47	created_on: 2006-07-19 21:07:27 +02:00	47	created_on: <%= 5.days.ago.to_date.to_s(:db) %>
48	project_id: 2	48	project_id: 2
49	updated_on: 2006-07-19 21:07:27 +02:00	49	updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
50	priority_id: 4	50	priority_id: 4
51	subject: Issue on project 2	51	subject: Issue on project 2
52	id: 4	52	id: 4
@@ -57,4 +57,18 issues_004:
57	assigned_to_id:	57	assigned_to_id:
58	author_id: 2	58	author_id: 2
59	status_id: 1	59	status_id: 1
		60	issues_005:
		61	created_on: <%= 5.days.ago.to_date.to_s(:db) %>
		62	project_id: 3
		63	updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
		64	priority_id: 4
		65	subject: Subproject issue
		66	id: 5
		67	fixed_version_id:
		68	category_id:
		69	description: This is an issue on a cookbook subproject
		70	tracker_id: 1
		71	assigned_to_id:
		72	author_id: 2
		73	status_id: 1
60		74

test/fixtures/messages.yml +2 -2

               parent_id:
               board_id: 1
             messages_005:
-              created_on: 2007-09-12 17:18:00 +02:00
+              created_on: <%= 3.days.ago.to_date.to_s(:db) %>
-              updated_on: 2007-09-12 17:18:00 +02:00
+              updated_on: <%= 3.days.ago.to_date.to_s(:db) %>
               subject: 'RE: post 2'
               id: 5
               replies_count: 0

test/functional/projects_controller_test.rb +55 -3

@@ -22,7 +22,8 require 'projects_controller'
22	class ProjectsController; def rescue_action(e) raise e end; end	22	class ProjectsController; def rescue_action(e) raise e end; end
23		23
24	class ProjectsControllerTest < Test::Unit::TestCase	24	class ProjectsControllerTest < Test::Unit::TestCase
25	fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details, ~~:trackers~~, ~~:projects_trackers~~, ~~:issue_statuses~~, ~~:enabled_modules~~, ~~:enumerations~~	25	fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
		26	:trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
26		27
27	def setup	28	def setup
28	@controller = ProjectsController.new	29	@controller = ProjectsController.new
@@ -129,11 +130,15 class ProjectsControllerTest < Test::Unit::TestCase
129	assert assigns(:versions).include?(Version.find(1))	130	assert assigns(:versions).include?(Version.find(1))
130	end	131	end
131		132
132	def test_activity	133	def test_project_activity
133	get :activity, :id => 1	134	get :activity, :id => 1, :with_subprojects => 0
134	assert_response :success	135	assert_response :success
135	assert_template 'activity'	136	assert_template 'activity'
136	assert_not_nil assigns(:events_by_day)	137	assert_not_nil assigns(:events_by_day)
		138	assert_not_nil assigns(:events)
		139
		140	# subproject issue not included by default
		141	assert !assigns(:events).include?(Issue.find(5))
137		142
138	assert_tag :tag => "h3",	143	assert_tag :tag => "h3",
139	:content => /#{2.days.ago.to_date.day}/,	144	:content => /#{2.days.ago.to_date.day}/,
@@ -163,6 +168,53 class ProjectsControllerTest < Test::Unit::TestCase
163	}	168	}
164	end	169	end
165		170
		171	def test_activity_with_subprojects
		172	get :activity, :id => 1, :with_subprojects => 1
		173	assert_response :success
		174	assert_template 'activity'
		175	assert_not_nil assigns(:events)
		176
		177	assert assigns(:events).include?(Issue.find(1))
		178	assert !assigns(:events).include?(Issue.find(4))
		179	# subproject issue
		180	assert assigns(:events).include?(Issue.find(5))
		181	end
		182
		183	def test_global_activity_anonymous
		184	get :activity
		185	assert_response :success
		186	assert_template 'activity'
		187	assert_not_nil assigns(:events)
		188
		189	assert assigns(:events).include?(Issue.find(1))
		190	# Issue of a private project
		191	assert !assigns(:events).include?(Issue.find(4))
		192	end
		193
		194	def test_global_activity_logged_user
		195	@request.session[:user_id] = 2 # manager
		196	get :activity
		197	assert_response :success
		198	assert_template 'activity'
		199	assert_not_nil assigns(:events)
		200
		201	assert assigns(:events).include?(Issue.find(1))
		202	# Issue of a private project the user belongs to
		203	assert assigns(:events).include?(Issue.find(4))
		204	end
		205
		206
		207	def test_global_activity_with_all_types
		208	get :activity, :show_issues => 1, :show_news => 1, :show_files => 1, :show_documents => 1, :show_changesets => 1, :show_wiki_pages => 1, :show_messages => 1
		209	assert_response :success
		210	assert_template 'activity'
		211	assert_not_nil assigns(:events)
		212
		213	assert assigns(:events).include?(Issue.find(1))
		214	assert !assigns(:events).include?(Issue.find(4))
		215	assert assigns(:events).include?(Message.find(5))
		216	end
		217
166	def test_calendar	218	def test_calendar
167	get :calendar, :id => 1	219	get :calendar, :id => 1
168	assert_response :success	220	assert_response :success

test/unit/project_test.rb 0 -9

@@ -126,13 +126,4 class ProjectTest < Test::Unit::TestCase
126	assert_equal [1, 2, 3], parent.rolled_up_trackers.collect(&:id)	126	assert_equal [1, 2, 3], parent.rolled_up_trackers.collect(&:id)
127	assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)	127	assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)
128	end	128	end
129
130	def test_issues_status_changes
131	journals = @ecookbook.issues_status_changes 3.days.ago.to_date, Date.today
132	assert_equal 1, journals.size
133	assert_kind_of Journal, journals.first
134
135	journals = @ecookbook.issues_status_changes 30.days.ago.to_date, 10.days.ago.to_date
136	assert_equal 0, journals.size
137	end
138	end	129	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