diff options
| author | Henare Degan <henare.degan@gmail.com> | 2012-10-04 14:58:01 +1000 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2012-10-04 15:12:03 +1000 |
| commit | 38a64203dd2e875e92c4bf4e5cd48ff59cd49526 (patch) | |
| tree | b9e28d225a387423acc583dbf72845886d8081a3 | |
| parent | 93dfbe495b5fb5e21b5fdf16a1c325a9eb8faa12 (diff) | |
Correct default value for ADMIN_BASE_URL
Back in 008e64e7 it was changed so that you could just set a blank value instead of '/admin/', it looks like test.yml was never updated and somehow lib/configuration.rb started off with the old value too.
| -rw-r--r-- | config/test.yml | 4 | ||||
| -rw-r--r-- | lib/configuration.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/link_to_helper_spec.rb | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config/test.yml b/config/test.yml index 5811b1785..ef270dcf2 100644 --- a/config/test.yml +++ b/config/test.yml @@ -72,7 +72,7 @@ CONTACT_NAME: 'Alaveteli Webmaster' RAW_EMAILS_LOCATION: 'files/raw_emails' # The base URL for admin pages. You probably don't want to change this. -ADMIN_BASE_URL: '/admin/' +ADMIN_BASE_URL: '' # Where /stylesheets sits under for admin pages. See asset_host in # config/environment.rb. Can be full domain or relative path (not an @@ -125,4 +125,4 @@ EXCEPTION_NOTIFICATIONS_TO: MAX_REQUESTS_PER_USER_PER_DAY: 2 VARNISH_HOST: varnish.localdomain -SKIP_ADMIN_AUTH: true
\ No newline at end of file +SKIP_ADMIN_AUTH: true diff --git a/lib/configuration.rb b/lib/configuration.rb index 03ca62343..79dbccf71 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -4,7 +4,7 @@ module Configuration DEFAULTS = { - :ADMIN_BASE_URL => '/admin/', + :ADMIN_BASE_URL => '', :ADMIN_PASSWORD => '', :ADMIN_PUBLIC_URL => '', :ADMIN_USERNAME => '', diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb index 582fe24d4..098fba008 100644 --- a/spec/helpers/link_to_helper_spec.rb +++ b/spec/helpers/link_to_helper_spec.rb @@ -51,11 +51,11 @@ describe LinkToHelper do describe 'admin_url' do context 'with no ADMIN_BASE_URL set' do it 'should prepend the admin general index path to a simple string' do - admin_url('unclassified').should == '/admin/unclassified' + admin_url('unclassified').should == '/en/admin/unclassified' end it 'should prepend the admin general index path to a deeper URL' do - admin_url('request/show/123').should == '/admin/request/show/123' + admin_url('request/show/123').should == '/en/admin/request/show/123' end end |