Move serving of js for admin interface from general to admin_general controller

2 files changed, 7 insertions, 6 deletions

diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb
index 81c34a3b3..800678787 100644
--- a/app/controllers/admin_general_controller.rb
+++ b/app/controllers/admin_general_controller.rb
@@ -5,6 +5,8 @@
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 
 class AdminGeneralController < AdminController
+    skip_before_filter :authenticate, :only => :admin_js
+
     def index
         # ensure we have a trailing slash
         current_uri = request.env['REQUEST_URI']
@@ -139,5 +141,10 @@ class AdminGeneralController < AdminController
         @github_origin = "https://github.com/#{repo}/tree/"
         @request_env = request.env
     end
+
+    # TODO: Remove this when support for proxy admin interface is removed
+    def admin_js
+      render :layout => false, :content_type => "application/javascript"
+    end
 end
 
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index d34f75a72..f6a46458e 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -229,11 +229,5 @@ class GeneralController < ApplicationController
         @locale = self.locale_from_params()
         render(:layout => false, :content_type => 'text/css')
     end
-
-    # For merged adminbootstraptheme
-    # TODO: Remove this ugly hack
-    def admin_js
-      render :layout => false, :content_type => "application/javascript"
-    end
 end