diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-02-19 13:02:48 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-02-25 16:26:52 +1100 |
| commit | e31d002858e9dd6b790285ce21f35ca1ae8fa72c (patch) | |
| tree | 7fa6ea917c7e4c1c24e1c9488d954f9b7d4a461d /app/controllers/general_controller.rb | |
| parent | 2a193d3bc74b812bd9ddee9d7520ca1e98007511 (diff) | |
Merge in adminbootstraptheme 323d704ab4f1ffe31f20fcabeaf030c462dfbadf into main project
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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 |