diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2009-12-23 06:27:44 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2009-12-23 06:27:44 +0000 |
| commit | bfcd5039f2884cb35f96ad6e64258c8a653c5348 (patch) | |
| tree | aaa5af5f74183dd2b56f0a4d37fc60d90e5e4372 /app | |
| parent | e07e9d8bfed47b7af782075485437a34e7dc20f8 (diff) | |
| download | redmine-bfcd5039f2884cb35f96ad6e64258c8a653c5348.tar.gz redmine-bfcd5039f2884cb35f96ad6e64258c8a653c5348.zip | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/settings_helper.rb | 3 | ||||
| -rw-r--r-- | app/views/settings/_integration.html.erb | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 45aeb9955..20a8e5760 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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]) diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index e57b75fcc..18212683d 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -24,7 +24,8 @@ module SettingsHelper {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking}, {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification}, {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => :label_incoming_emails}, - {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural} + {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}, + {:name => 'integration', :partial => 'settings/integration', :label => :label_integration} ] end diff --git a/app/views/settings/_integration.html.erb b/app/views/settings/_integration.html.erb new file mode 100644 index 000000000..23a612e56 --- /dev/null +++ b/app/views/settings/_integration.html.erb @@ -0,0 +1,8 @@ +<% form_tag({:action => 'edit', :tab => 'integration'}) do %> + +<div class="box tabular settings"> +<p><%= setting_check_box :rest_api_enabled %></p> +</div> + +<%= submit_tag l(:button_save) %> +<% end %> |