jro_apps/redmine Commit - r6078:a5bcdf6d2c93

app/controllers/activities_controller.rb +18 -1

@@ -1,7 +1,24
		1	# Redmine - project management software
		2	# Copyright (C) 2006-2011 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
1	class ActivitiesController < ApplicationController	18	class ActivitiesController < ApplicationController
2	menu_item :activity	19	menu_item :activity
3	before_filter :find_optional_project	20	before_filter :find_optional_project
4	accept_~~key~~_auth :index	21	accept_rss_auth :index
5		22
6	def index	23	def index
7	@days = Setting.activity_days_default.to_i	24	@days = Setting.activity_days_default.to_i

app/controllers/application_controller.rb +33 -6

@@ -71,11 +71,11 class ApplicationController < ActionController::Base
71	user = User.try_to_autologin(cookies[:autologin])	71	user = User.try_to_autologin(cookies[:autologin])
72	session[:user_id] = user.id if user	72	session[:user_id] = user.id if user
73	user	73	user
74	elsif params[:format] == 'atom' && ~~request~~.~~get?~~ && params[:key] && ~~accept_key_auth_actions~~.~~include?~~(~~params~~[~~:action~~])	74	elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
75	# RSS key authentication does not start a session	75	# RSS key authentication does not start a session
76	User.find_by_rss_key(params[:key])	76	User.find_by_rss_key(params[:key])
77	elsif Setting.rest_api_enabled? && a~~pi_request~~?	77	elsif Setting.rest_api_enabled? && accept_api_auth?
78	if (key = api_key_from_request) && accept_key_auth_actions.include?(params[:action])	78	if (key = api_key_from_request)
79	# Use API key	79	# Use API key
80	User.find_by_api_key(key)	80	User.find_by_api_key(key)
81	else	81	else
@@ -333,13 +333,40 class ApplicationController < ActionController::Base
333	render :template => "common/feed.atom.rxml", :layout => false, :content_type => 'application/atom+xml'	333	render :template => "common/feed.atom.rxml", :layout => false, :content_type => 'application/atom+xml'
334	end	334	end
335		335
		336	# TODO: remove in Redmine 1.4
336	def self.accept_key_auth(*actions)	337	def self.accept_key_auth(*actions)
337	actions = actions.flatten.map(&:to_s)	338	ActiveSupport::Deprecaction.warn "ApplicationController.accept_key_auth is deprecated and will be removed in Redmine 1.4. Use accept_rss_auth (or accept_api_auth) instead."
338	write_inheritable_attribute('accept_key_auth_actions', actions)	339	accept_rss_auth(*actions)
339	end	340	end
340		341
		342	# TODO: remove in Redmine 1.4
341	def accept_key_auth_actions	343	def accept_key_auth_actions
342	self.class.read_inheritable_attribute('accept_key_auth_actions') \|\| []	344	ActiveSupport::Deprecaction.warn "ApplicationController.accept_key_auth_actions is deprecated and will be removed in Redmine 1.4. Use accept_rss_auth (or accept_api_auth) instead."
		345	self.class.accept_rss_auth
		346	end
		347
		348	def self.accept_rss_auth(*actions)
		349	if actions.any?
		350	write_inheritable_attribute('accept_rss_auth_actions', actions)
		351	else
		352	read_inheritable_attribute('accept_rss_auth_actions') \|\| []
		353	end
		354	end
		355
		356	def accept_rss_auth?(action=action_name)
		357	self.class.accept_rss_auth.include?(action.to_sym)
		358	end
		359
		360	def self.accept_api_auth(*actions)
		361	if actions.any?
		362	write_inheritable_attribute('accept_api_auth_actions', actions)
		363	else
		364	read_inheritable_attribute('accept_api_auth_actions') \|\| []
		365	end
		366	end
		367
		368	def accept_api_auth?(action=action_name)
		369	self.class.accept_api_auth.include?(action.to_sym)
343	end	370	end
344		371
345	# Returns the number of objects that should be displayed	372	# Returns the number of objects that should be displayed

app/controllers/boards_controller.rb +3 -3

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             class BoardsController < ApplicationController
               default_search_scope :messages
               before_filter :find_project, :find_board_if_available, :authorize
-              accept_key_auth :index, :show
+              accept_rss_auth :index, :show
               helper :messages
               include MessagesHelper

app/controllers/issue_relations_controller.rb +1 -1

-            # redMine - project management software
+            # Redmine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or

app/controllers/issues_controller.rb +2 -1

               before_filter :find_optional_project, :only => [:index]
               before_filter :check_for_default_issue_status, :only => [:new, :create]
               before_filter :build_new_issue_from_params, :only => [:new, :create]
-              accept_key_auth :index, :show, :create, :update, :destroy
+              accept_rss_auth :index, :show
+              accept_api_auth :index, :show, :create, :update, :destroy
               rescue_from Query::StatementInvalid, :with => :query_statement_invalid

app/controllers/journals_controller.rb +1 -1

               before_filter :find_issue, :only => [:new]
               before_filter :find_optional_project, :only => [:index]
               before_filter :authorize, :only => [:new, :edit, :diff]
-              accept_key_auth :index
+              accept_rss_auth :index
               menu_item :issues
               helper :issues

app/controllers/news_controller.rb +2 -1

               before_filter :find_project, :only => [:new, :create]
               before_filter :authorize, :except => [:index]
               before_filter :find_optional_project, :only => :index
-              accept_key_auth :index
+              accept_rss_auth :index
+              accept_api_auth :index
               helper :watchers

app/controllers/projects_controller.rb +2 -1

               before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
               before_filter :authorize_global, :only => [:new, :create]
               before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
-              accept_key_auth :index, :show, :create, :update, :destroy
+              accept_rss_auth :index
+              accept_api_auth :index, :show, :create, :update, :destroy
               after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
                 if controller.request.post?

app/controllers/repositories_controller.rb +1 -1

               before_filter :find_repository, :except => :edit
               before_filter :find_project, :only => :edit
               before_filter :authorize
-              accept_key_auth :revisions
+              accept_rss_auth :revisions
               rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed

app/controllers/timelog_controller.rb +3 -2

             # Redmine - project management software
-            # Copyright (C) 2006-2010  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
               before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
               before_filter :authorize, :except => [:index]
               before_filter :find_optional_project, :only => [:index]
-              accept_key_auth :index, :show, :create, :update, :destroy
+              accept_rss_auth :index
+              accept_api_auth :index, :show, :create, :update, :destroy
               helper :sort
               include SortHelper

app/controllers/users_controller.rb +1 -1

               before_filter :require_admin, :except => :show
               before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership]
-              accept_key_auth :index, :show, :create, :update, :destroy
+              accept_api_auth :index, :show, :create, :update, :destroy
               helper :sort
               include SortHelper

	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