From e31d002858e9dd6b790285ce21f35ca1ae8fa72c Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 19 Feb 2013 13:02:48 +1100 Subject: Merge in adminbootstraptheme 323d704ab4f1ffe31f20fcabeaf030c462dfbadf into main project --- app/controllers/general_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/controllers/general_controller.rb') diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index a8bbc22ff..d34f75a72 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -230,6 +230,10 @@ class GeneralController < ApplicationController 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 -- cgit v1.2.3