aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/general.yml-example3
-rw-r--r--config/initializers/alaveteli.rb2
-rw-r--r--config/routes.rb18
3 files changed, 21 insertions, 2 deletions
diff --git a/config/general.yml-example b/config/general.yml-example
index ac96b5e50..22d4d45aa 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -571,6 +571,7 @@ GA_CODE: ''
# body go to you, use this setting. This is useful for a staging server, so you
# can play with the whole process of sending requests without inadvertently
# sending an email to a real authority.
+# Leave blank ('') to send requests to the real authority emails.
#
# OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS - String (default: nil)
#
@@ -579,7 +580,7 @@ GA_CODE: ''
# OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS: test-email@example.com
#
# ---
-# OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS: test-email@example.com
+OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS: ''
# Search path for external commandline utilities (such as pdftohtml, pdftk,
# unrtf)
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index 3a1220326..2ca85579a 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@ load "debug_helpers.rb"
load "util.rb"
# Application version
-ALAVETELI_VERSION = '0.19'
+ALAVETELI_VERSION = '0.20.0.0'
# Add new inflection rules using the following format
# (all these examples are active by default):
diff --git a/config/routes.rb b/config/routes.rb
index eabfb9053..4b2eb5695 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -268,6 +268,24 @@ Alaveteli::Application.routes.draw do
match '/admin/censor/edit/:id' => 'admin_censor_rule#edit', :as => :admin_rule_edit
match '/admin/censor/update/:id' => 'admin_censor_rule#update', :as => :admin_rule_update
match '/admin/censor/destroy/:censor_rule_id' => 'admin_censor_rule#destroy', :as => :admin_rule_destroy
+
+ scope '/admin', :as => 'admin' do
+ resources :info_requests, :only => [] do
+ resources :censor_rules,
+ :controller => 'admin_censor_rule',
+ :only => [:new, :create],
+ :name_prefix => 'info_request_'
+ end
+ end
+
+ scope '/admin', :as => 'admin' do
+ resources :users, :only => [] do
+ resources :censor_rules,
+ :controller => 'admin_censor_rule',
+ :only => [:new, :create],
+ :name_prefix => 'user_'
+ end
+ end
####
#### AdminSpamAddresses controller