Merge remote branch 'origin/master' into bootstrap

Conflicts: app/views/layouts/rails_admin/_header.html.haml app/views/rails_admin/main/_form_text.html.haml
jasonfox · Oct 4, 2011 · 5a7212e · 5a7212e
2 parents 5c71fa4 + 1cb0628
commit 5a7212e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/views/rails_admin/main/_form_filtering_select.html.haml b/app/views/rails_admin/main/_form_filtering_select.html.haml
@@ -32,7 +32,7 @@
     createQuery: function(query) {
     return { query: query }
     },
-    source: "#{list_path(config.abstract_model.to_param, :compact => true)}"
+    source: "#{list_path(config.abstract_model.to_param, :compact => true).html_safe}"
   });
   if($(".createAssociatedRecordDialog").length == 0) {
   $("##{field.dom_id}_field .createAssociatedRecord").remoteForm({ dialogClass: "createAssociatedRecordDialog" });

diff --git a/app/views/rails_admin/main/_form_text.html.haml b/app/views/rails_admin/main/_form_text.html.haml
@@ -3,8 +3,8 @@
 - if field.ckeditor
   -# needed for modal windows
   = javascript_tag do
-    var CKEDITOR_BASEPATH = '/javascripts/ckeditor/';
-  = javascript_include_tag "/javascripts/ckeditor/ckeditor.js"
+    var CKEDITOR_BASEPATH = 'javascripts/ckeditor/';
+  = javascript_include_tag "javascripts/ckeditor/ckeditor.js"
   = javascript_tag do
     jQuery(function($) {
     CKEDITOR.replace('#{field.dom_id}',