diff options
| author | David Cabo <david@calibea.com> | 2011-08-12 13:12:50 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-12 13:12:50 +0200 |
| commit | df1754847892bb6abce2681a42d8c50cf8d3a2da (patch) | |
| tree | 73c518103906ad446cedd55c69690d8d91f0f362 /app/controllers/admin_general_controller.rb | |
| parent | a63e598b9e0ddfa7ac695b1be41aaace6c0eb628 (diff) | |
| parent | 766df1c7de8f820bd6e451526787632a136bc635 (diff) | |
Merge branch 'master' of github.com:sebbacon/alaveteli into asktheeu
Conflicts:
locale/cy/app.po
locale/de/app.po
locale/es/app.po
locale/fr/app.po
locale/sq/app.po
locale/sr/app.po
locale/sr@latin/app.po
Diffstat (limited to 'app/controllers/admin_general_controller.rb')
| -rw-r--r-- | app/controllers/admin_general_controller.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index 5073cdc5b..ae51e0923 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -8,6 +8,13 @@ class AdminGeneralController < AdminController def index + # ensure we have a trailing slash + current_uri = request.env['REQUEST_URI'] + if params[:suppress_redirect].nil? && !(current_uri =~ /\/$/) + redirect_to admin_general_index_url + "/" + return + end + # Overview counts of things @public_body_count = PublicBody.count |