Add admin_dialogs_path and use that in wym setup.

Conflicts: core/app/assets/javascripts/refinery/boot_wym.js.erb
refinery · May 2, 2012 · 21ab29b · 21ab29b
1 parent 6f5ca0e
commit 21ab29b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/core/app/assets/javascripts/refinery/boot_wym.js.erb b/core/app/assets/javascripts/refinery/boot_wym.js.erb
@@ -158,7 +158,7 @@ var wymeditor_boot_options = $.extend({
       + "</form>"
     + "</div>"
 
-  , dialogPath: "/refinery/dialogs/"
+  , dialogPath: "<%= Refinery::Core::Engine.routes.url_helpers.admin_dialogs_path %>/"
   , dialogFeatures: {
       width: 866
     , height: 455

diff --git a/core/app/controllers/refinery/admin/dialogs_controller.rb b/core/app/controllers/refinery/admin/dialogs_controller.rb
@@ -1,6 +1,10 @@
 module ::Refinery
   module Admin
     class DialogsController < ::Refinery::AdminController
+      def index
+        redirect_to refinery.admin_root_path
+      end
+
       def show
         @dialog_type = params[:id].downcase
 

diff --git a/core/config/routes.rb b/core/config/routes.rb
@@ -5,7 +5,7 @@
 
   namespace :admin, :path => 'refinery' do
     root :to => 'dashboard#index'
-    resources :dialogs, :only => :show
+    resources :dialogs, :only => [:index, :show]
   end
 
   match '/refinery/update_menu_positions', :to => 'admin/core#update_plugin_positions'