aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin_controller.rb3
-rw-r--r--app/controllers/admin_public_body_controller.rb3
-rw-r--r--app/controllers/admin_request_controller.rb3
-rw-r--r--app/controllers/admin_user_controller.rb3
-rw-r--r--app/controllers/application.rb5
5 files changed, 12 insertions, 5 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 3718b0bd2..33cc9b26c 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -4,10 +4,11 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: admin_controller.rb,v 1.9 2008-04-09 02:51:46 francis Exp $
+# $Id: admin_controller.rb,v 1.10 2008-04-11 15:53:57 francis Exp $
class AdminController < ApplicationController
layout "admin"
+ before_filter :assign_http_auth_user
def index
# Overview counts of things
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index 22c3208cd..dbaba324a 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -4,10 +4,11 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: admin_public_body_controller.rb,v 1.10 2008-03-31 13:26:09 francis Exp $
+# $Id: admin_public_body_controller.rb,v 1.11 2008-04-11 15:53:57 francis Exp $
class AdminPublicBodyController < ApplicationController
layout "admin"
+ before_filter :assign_http_auth_user
def index
list
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 0dcf9a52c..6e7ebd1b8 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -4,10 +4,11 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: admin_request_controller.rb,v 1.8 2008-03-14 10:13:00 francis Exp $
+# $Id: admin_request_controller.rb,v 1.9 2008-04-11 15:53:57 francis Exp $
class AdminRequestController < ApplicationController
layout "admin"
+ before_filter :assign_http_auth_user
def index
list
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb
index e66839bc2..ddbc781f2 100644
--- a/app/controllers/admin_user_controller.rb
+++ b/app/controllers/admin_user_controller.rb
@@ -4,10 +4,11 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: admin_user_controller.rb,v 1.2 2008-03-14 10:15:43 francis Exp $
+# $Id: admin_user_controller.rb,v 1.3 2008-04-11 15:53:57 francis Exp $
class AdminUserController < ApplicationController
layout "admin"
+ before_filter :assign_http_auth_user
def index
list
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 39a676669..e8c8ec199 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -6,7 +6,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: application.rb,v 1.36 2008-04-09 01:32:52 francis Exp $
+# $Id: application.rb,v 1.37 2008-04-11 15:53:57 francis Exp $
class ApplicationController < ActionController::Base
@@ -123,6 +123,9 @@ class ApplicationController < ActionController::Base
return request.env["REMOTE_USER"]
end
end
+ def assign_http_auth_user
+ @http_auth_user = admin_http_auth_user
+ end
# Convert URL name for sort by order, to Lucene query
def order_to_sort_by(sortby)