jro_apps/redmine Commit - r4003:8fa5019e69f6

Merged r4047 from trunk....

Eric Davis -

r4003:8fa5019e69f6

parent child

Context file:

r4003:8fa5019e69f6

Collapse all files

app/controllers/activities_controller.rb created 644 +59 0

@@ -0,0 +1,59
	1	class ActivitiesController < ApplicationController
	2	menu_item :activity
	3	before_filter :find_optional_project
	4	accept_key_auth :index
	5
	6	def index
	7	@days = Setting.activity_days_default.to_i
	8
	9	if params[:from]
	10	begin; @date_to = params[:from].to_date + 1; rescue; end
	11	end
	12
	13	@date_to \|\|= Date.today + 1
	14	@date_from = @date_to - @days
	15	@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
	16	@author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
	17
	18	@activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
	19	:with_subprojects => @with_subprojects,
	20	:author => @author)
	21	@activity.scope_select {\|t\| !params["show_#{t}"].nil?}
	22	@activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
	23
	24	events = @activity.events(@date_from, @date_to)
	25
	26	if events.empty? \|\| stale?(:etag => [events.first, User.current])
	27	respond_to do \|format\|
	28	format.html {
	29	@events_by_day = events.group_by(&:event_date)
	30	render :layout => false if request.xhr?
	31	}
	32	format.atom {
	33	title = l(:label_activity)
	34	if @author
	35	title = @author.name
	36	elsif @activity.scope.size == 1
	37	title = l("label_#{@activity.scope.first.singularize}_plural")
	38	end
	39	render_feed(events, :title => "#{@project \|\| Setting.app_title}: #{title}")
	40	}
	41	end
	42	end
	43
	44	rescue ActiveRecord::RecordNotFound
	45	render_404
	46	end
	47
	48	private
	49
	50	# TODO: refactor, duplicated in projects_controller
	51	def find_optional_project
	52	return true unless params[:id]
	53	@project = Project.find(params[:id])
	54	authorize
	55	rescue ActiveRecord::RecordNotFound
	56	render_404
	57	end
	58
	59	end

test/functional/activities_controller_test.rb created 644 +87 0

@@ -0,0 +1,87
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class ActivitiesControllerTest < ActionController::TestCase
	4	fixtures :all
	5
	6	def test_project_index
	7	get :index, :id => 1, :with_subprojects => 0
	8	assert_response :success
	9	assert_template 'index'
	10	assert_not_nil assigns(:events_by_day)
	11
	12	assert_tag :tag => "h3",
	13	:content => /#{2.days.ago.to_date.day}/,
	14	:sibling => { :tag => "dl",
	15	:child => { :tag => "dt",
	16	:attributes => { :class => /issue-edit/ },
	17	:child => { :tag => "a",
	18	:content => /(#{IssueStatus.find(2).name})/,
	19	}
	20	}
	21	}
	22	end
	23
	24	def test_previous_project_index
	25	get :index, :id => 1, :from => 3.days.ago.to_date
	26	assert_response :success
	27	assert_template 'index'
	28	assert_not_nil assigns(:events_by_day)
	29
	30	assert_tag :tag => "h3",
	31	:content => /#{3.day.ago.to_date.day}/,
	32	:sibling => { :tag => "dl",
	33	:child => { :tag => "dt",
	34	:attributes => { :class => /issue/ },
	35	:child => { :tag => "a",
	36	:content => /#{Issue.find(1).subject}/,
	37	}
	38	}
	39	}
	40	end
	41
	42	def test_global_index
	43	get :index
	44	assert_response :success
	45	assert_template 'index'
	46	assert_not_nil assigns(:events_by_day)
	47
	48	assert_tag :tag => "h3",
	49	:content => /#{5.day.ago.to_date.day}/,
	50	:sibling => { :tag => "dl",
	51	:child => { :tag => "dt",
	52	:attributes => { :class => /issue/ },
	53	:child => { :tag => "a",
	54	:content => /#{Issue.find(5).subject}/,
	55	}
	56	}
	57	}
	58	end
	59
	60	def test_user_index
	61	get :index, :user_id => 2
	62	assert_response :success
	63	assert_template 'index'
	64	assert_not_nil assigns(:events_by_day)
	65
	66	assert_tag :tag => "h3",
	67	:content => /#{3.day.ago.to_date.day}/,
	68	:sibling => { :tag => "dl",
	69	:child => { :tag => "dt",
	70	:attributes => { :class => /issue/ },
	71	:child => { :tag => "a",
	72	:content => /#{Issue.find(1).subject}/,
	73	}
	74	}
	75	}
	76	end
	77
	78	def test_index_atom_feed
	79	get :index, :format => 'atom'
	80	assert_response :success
	81	assert_template 'common/feed.atom.rxml'
	82	assert_tag :tag => 'entry', :child => {
	83	:tag => 'link',
	84	:attributes => {:href => 'http://test.host/issues/11'}}
	85	end
	86
	87	end

app/controllers/projects_controller.rb +3 -47

@@ -17,17 +17,15
17		17
18	class ProjectsController < ApplicationController	18	class ProjectsController < ApplicationController
19	menu_item :overview	19	menu_item :overview
20	menu_item :activity, :only => :activity
21	menu_item :roadmap, :only => :roadmap	20	menu_item :roadmap, :only => :roadmap
22	menu_item :files, :only => [:list_files, :add_file]	21	menu_item :files, :only => [:list_files, :add_file]
23	menu_item :settings, :only => :settings	22	menu_item :settings, :only => :settings
24		23
25	before_filter :find_project, :except => [ :index, :list, :add, :copy, ~~:activity~~ ]	24	before_filter :find_project, :except => [ :index, :list, :add, :copy ]
26	before_filter :find_optional_project, :only => :activity	25	before_filter :authorize, :except => [ :index, :list, :add, :copy, :archive, :unarchive, :destroy]
27	before_filter :authorize, :except => [ :index, :list, :add, :copy, :archive, :unarchive, :destroy, :activity ]
28	before_filter :authorize_global, :only => :add	26	before_filter :authorize_global, :only => :add
29	before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]	27	before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
30	accept_key_auth ~~:activity~~, :index	28	accept_key_auth :index
31		29
32	after_filter :only => [:add, :edit, :archive, :unarchive, :destroy] do \|controller\|	30	after_filter :only => [:add, :edit, :archive, :unarchive, :destroy] do \|controller\|
33	if controller.request.post?	31	if controller.request.post?
@@ -313,48 +311,6 class ProjectsController < ApplicationController
313	@versions.reject! {\|version\| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}	311	@versions.reject! {\|version\| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
314	end	312	end
315		313
316	def activity
317	@days = Setting.activity_days_default.to_i
318
319	if params[:from]
320	begin; @date_to = params[:from].to_date + 1; rescue; end
321	end
322
323	@date_to \|\|= Date.today + 1
324	@date_from = @date_to - @days
325	@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
326	@author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
327
328	@activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
329	:with_subprojects => @with_subprojects,
330	:author => @author)
331	@activity.scope_select {\|t\| !params["show_#{t}"].nil?}
332	@activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
333
334	events = @activity.events(@date_from, @date_to)
335
336	if events.empty? \|\| stale?(:etag => [events.first, User.current])
337	respond_to do \|format\|
338	format.html {
339	@events_by_day = events.group_by(&:event_date)
340	render :layout => false if request.xhr?
341	}
342	format.atom {
343	title = l(:label_activity)
344	if @author
345	title = @author.name
346	elsif @activity.scope.size == 1
347	title = l("label_#{@activity.scope.first.singularize}_plural")
348	end
349	render_feed(events, :title => "#{@project \|\| Setting.app_title}: #{title}")
350	}
351	end
352	end
353
354	rescue ActiveRecord::RecordNotFound
355	render_404
356	end
357
358	private	314	private
359	def find_optional_project	315	def find_optional_project
360	return true unless params[:id]	316	return true unless params[:id]

app/views/activities/index.html.erb ~~app/views/projects/activity.rhtml~~ renamed 0 0

NO CONTENT: file renamed from app/views/projects/activity.rhtml to app/views/activities/index.html.erb

app/views/boards/index.rhtml +2 -2

             </table>
             <% other_formats_links do |f| %>
-            	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
+            	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
             <% end %>
             <% content_for :header_tags do %>
-              <%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
+              <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
             <% end %>
             <% html_title l(:label_board_plural) %>

app/views/projects/index.rhtml +1 -1

                 <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
                 <%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
                 <%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
-                <%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
+                <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
             </div>
             <h2><%=l(:label_project_plural)%></h2>

app/views/projects/show.rhtml +1 -1

             <% end %>
             <% content_for :header_tags do %>
-            <%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
+            <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
             <% end %>
             <% html_title(l(:label_overview)) -%>

app/views/users/show.rhtml +3 -3

             <div class="splitcontentright">
             <% unless @events_by_day.empty? %>
-            <h3><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %></h3>
+            <h3><%= link_to l(:label_activity), :controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %></h3>
             <p>
             <%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
             </div>
             <% other_formats_links do |f| %>
-            	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
+            	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
             <% end %>
             <% content_for :header_tags do %>
-            		<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
+            		<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
             <% end %>
             <% end %>
             <%= call_hook :view_account_right_bottom, :user => @user %>

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

             <% content_for :header_tags do %>
             <%= 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'},
+            <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
                                                :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
             <% end %>

app/views/wiki/special_date_index.rhtml +2 -2

             <% unless @pages.empty? %>
             <% other_formats_links do |f| %>
-            	<%= f.link_to 'Atom', :url => {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+            	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
             	<%= f.link_to('HTML', :url => {:action => 'special', :page => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
             <% end %>
             <% end %>
             <% content_for :header_tags do %>
-            <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+            <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
             <% end %>

config/routes.rb +1 -1

                   project_views.connect 'projects/:id/settings/:tab', :action => 'settings'
                 end
-                projects.with_options :action => 'activity', :conditions => {:method => :get} do |activity|
+                projects.with_options :controller => 'activities', :action => 'index', :conditions => {:method => :get} do |activity|
                   activity.connect 'projects/:id/activity'
                   activity.connect 'projects/:id/activity.:format'
                   activity.connect 'activity', :id => nil

lib/redmine.rb +2 -2

             # Permissions
             Redmine::AccessControl.map do |map|
-              map.permission :view_project, {:projects => [:show, :activity]}, :public => true
+              map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :add_project, {:projects => :add}, :require => :loggedin
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :overview, { :controller => 'projects', :action => 'show' }
-              menu.push :activity, { :controller => 'projects', :action => 'activity' }
+              menu.push :activity, { :controller => 'activities', :action => 'index' }
               menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' },
                           :if => Proc.new { |p| p.shared_versions.any? }
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural

test/functional/projects_controller_test.rb 0 -81

@@ -400,87 +400,6 class ProjectsControllerTest < ActionController::TestCase
400	assert assigns(:versions).include?(Version.find(4)), "Shared version not found"	400	assert assigns(:versions).include?(Version.find(4)), "Shared version not found"
401	assert assigns(:versions).include?(@subproject_version), "Subproject version not found"	401	assert assigns(:versions).include?(@subproject_version), "Subproject version not found"
402	end	402	end
403	def test_project_activity
404	get :activity, :id => 1, :with_subprojects => 0
405	assert_response :success
406	assert_template 'activity'
407	assert_not_nil assigns(:events_by_day)
408
409	assert_tag :tag => "h3",
410	:content => /#{2.days.ago.to_date.day}/,
411	:sibling => { :tag => "dl",
412	:child => { :tag => "dt",
413	:attributes => { :class => /issue-edit/ },
414	:child => { :tag => "a",
415	:content => /(#{IssueStatus.find(2).name})/,
416	}
417	}
418	}
419	end
420
421	def test_previous_project_activity
422	get :activity, :id => 1, :from => 3.days.ago.to_date
423	assert_response :success
424	assert_template 'activity'
425	assert_not_nil assigns(:events_by_day)
426
427	assert_tag :tag => "h3",
428	:content => /#{3.day.ago.to_date.day}/,
429	:sibling => { :tag => "dl",
430	:child => { :tag => "dt",
431	:attributes => { :class => /issue/ },
432	:child => { :tag => "a",
433	:content => /#{Issue.find(1).subject}/,
434	}
435	}
436	}
437	end
438
439	def test_global_activity
440	get :activity
441	assert_response :success
442	assert_template 'activity'
443	assert_not_nil assigns(:events_by_day)
444
445	assert_tag :tag => "h3",
446	:content => /#{5.day.ago.to_date.day}/,
447	:sibling => { :tag => "dl",
448	:child => { :tag => "dt",
449	:attributes => { :class => /issue/ },
450	:child => { :tag => "a",
451	:content => /#{Issue.find(5).subject}/,
452	}
453	}
454	}
455	end
456
457	def test_user_activity
458	get :activity, :user_id => 2
459	assert_response :success
460	assert_template 'activity'
461	assert_not_nil assigns(:events_by_day)
462
463	assert_tag :tag => "h3",
464	:content => /#{3.day.ago.to_date.day}/,
465	:sibling => { :tag => "dl",
466	:child => { :tag => "dt",
467	:attributes => { :class => /issue/ },
468	:child => { :tag => "a",
469	:content => /#{Issue.find(1).subject}/,
470	}
471	}
472	}
473	end
474
475	def test_activity_atom_feed
476	get :activity, :format => 'atom'
477	assert_response :success
478	assert_template 'common/feed.atom.rxml'
479	assert_tag :tag => 'entry', :child => {
480	:tag => 'link',
481	:attributes => {:href => 'http://test.host/issues/11'}}
482	end
483
484	def test_archive	403	def test_archive
485	@request.session[:user_id] = 1 # admin	404	@request.session[:user_id] = 1 # admin
486	post :archive, :id => 1	405	post :archive, :id => 1

test/integration/routing_test.rb +4 -4

             class RoutingTest < ActionController::IntegrationTest
               context "activities" do
-                should_route :get, "/activity", :controller => 'projects', :action => 'activity', :id => nil
+                should_route :get, "/activity", :controller => 'activities', :action => 'index', :id => nil
-                should_route :get, "/activity.atom", :controller => 'projects', :action => 'activity', :id => nil, :format => 'atom'
+                should_route :get, "/activity.atom", :controller => 'activities', :action => 'index', :id => nil, :format => 'atom'
               end
               context "attachments" do
                 should_route :get, "/projects/33/files", :controller => 'projects', :action => 'list_files', :id => '33'
                 should_route :get, "/projects/33/files/new", :controller => 'projects', :action => 'add_file', :id => '33'
                 should_route :get, "/projects/33/roadmap", :controller => 'projects', :action => 'roadmap', :id => '33'
-                should_route :get, "/projects/33/activity", :controller => 'projects', :action => 'activity', :id => '33'
+                should_route :get, "/projects/33/activity", :controller => 'activities', :action => 'index', :id => '33'
-                should_route :get, "/projects/33/activity.atom", :controller => 'projects', :action => 'activity', :id => '33', :format => 'atom'
+                should_route :get, "/projects/33/activity.atom", :controller => 'activities', :action => 'index', :id => '33', :format => 'atom'
                 should_route :post, "/projects/new", :controller => 'projects', :action => 'add'
                 should_route :post, "/projects.xml", :controller => 'projects', :action => 'add', :format => 'xml'

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