Added an Admin setting to enable/disable the REST web service. (#3920)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3220 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis
2009-12-23 06:27:44 +00:00
parent e07e9d8bfe
commit bfcd5039f2
9 changed files with 131 additions and 2 deletions
+1 -1
View File
@@ -70,7 +70,7 @@ class ApplicationController < ActionController::Base
elsif params[:format] == 'atom' && params[:key] && accept_key_auth_actions.include?(params[:action])
# RSS key authentication does not start a session
User.find_by_rss_key(params[:key])
elsif ['xml', 'json'].include?(params[:format]) && accept_key_auth_actions.include?(params[:action])
elsif Setting.rest_api_enabled? && ['xml', 'json'].include?(params[:format]) && accept_key_auth_actions.include?(params[:action])
if params[:key].present?
# Use API key
User.find_by_api_key(params[:key])