From f9d51ed549427f3d47683f76c53911c1e30afb82 Mon Sep 17 00:00:00 2001
From: Mark Stuart <mark.stuart@resolvedigital.co.nz>
Date: Mon, 30 Jan 2012 17:38:48 +1300
Subject: Correct path for form tag. Updated cancel_url to new format.

---
 .../refinery/blog/admin/settings/notification_recipients.html.erb     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/refinery/blog/admin/settings/notification_recipients.html.erb b/app/views/refinery/blog/admin/settings/notification_recipients.html.erb
index af2650d..f4579d3 100644
--- a/app/views/refinery/blog/admin/settings/notification_recipients.html.erb
+++ b/app/views/refinery/blog/admin/settings/notification_recipients.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag do %>
+<%= form_tag main_app.notification_recipients_refinery_blog_admin_settings_path do %>
 
   <div class='field'>
     <span class='label_with_help'>
@@ -18,7 +18,7 @@
              :locals => {
                :f => nil,
                :continue_editing => false,
-               :cancel_url => refinery_blog_admin_posts_url,
+               :cancel_url => main_app.refinery_blog_admin_posts_url,
                :hide_delete => true
              } %>
 <% end %>
-- 
cgit v1.2.3


From 2a672af348f910c96e386eedff384a8adca6dc64 Mon Sep 17 00:00:00 2001
From: Mark Stuart <mark.stuart@resolvedigital.co.nz>
Date: Mon, 30 Jan 2012 17:41:11 +1300
Subject: New 'main_app.' format

---
 app/controllers/refinery/blog/admin/posts_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/refinery/blog/admin/posts_controller.rb b/app/controllers/refinery/blog/admin/posts_controller.rb
index 2ed2b98..f8d0f8f 100644
--- a/app/controllers/refinery/blog/admin/posts_controller.rb
+++ b/app/controllers/refinery/blog/admin/posts_controller.rb
@@ -63,7 +63,7 @@ module Refinery
                 end
               end
             else
-              render :text => "<script>parent.window.location = '#{refinery_blog_admin_posts_url}';</script>"
+              render :text => "<script>parent.window.location = '#{main_app.refinery_blog_admin_posts_url}';</script>"
             end
           else
             unless request.xhr?
-- 
cgit v1.2.3


From e46f0549c6aca4c9b32a4cec1aa7c70d65d7f910 Mon Sep 17 00:00:00 2001
From: Mark Stuart <mark.stuart@resolvedigital.co.nz>
Date: Mon, 30 Jan 2012 17:42:26 +1300
Subject: New 'main_app.' format.

---
 app/controllers/refinery/blog/admin/settings_controller.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/refinery/blog/admin/settings_controller.rb b/app/controllers/refinery/blog/admin/settings_controller.rb
index 34a8d00..e47fe7b 100644
--- a/app/controllers/refinery/blog/admin/settings_controller.rb
+++ b/app/controllers/refinery/blog/admin/settings_controller.rb
@@ -11,9 +11,9 @@ module Refinery
             flash[:notice] = t('updated', :scope => 'admin.blog.settings.notification_recipients',
                                :recipients => Refinery::Blog::Comment::Notification.recipients)
             unless request.xhr? or from_dialog?
-              redirect_back_or_default(refinery_blog_admin_posts_path)
+              redirect_back_or_default(main_app.refinery_blog_admin_posts_path)
             else
-              render :text => "<script type='text/javascript'>parent.window.location = '#{refinery_blog_admin_posts_path}';</script>",
+              render :text => "<script type='text/javascript'>parent.window.location = '#{main_app.refinery_blog_admin_posts_path}';</script>",
                      :layout => false
             end
           end
@@ -22,7 +22,7 @@ module Refinery
         def moderation
           enabled = Refinery::Blog::Comment::Moderation.toggle!
           unless request.xhr?
-            redirect_back_or_default(refinery_blog_admin_posts_path)
+            redirect_back_or_default(main_app.refinery_blog_admin_posts_path)
           else
             render :json => {:enabled => enabled},
                    :layout => false
@@ -32,7 +32,7 @@ module Refinery
         def comments
           enabled = Refinery::Blog::Comment.toggle!
           unless request.xhr?
-            redirect_back_or_default(refinery_blog_admin_posts_path)
+            redirect_back_or_default(main_app.refinery_blog_admin_posts_path)
           else
             render :json => {:enabled => enabled},
                    :layout => false
@@ -42,7 +42,7 @@ module Refinery
         def teasers
           enabled = Refinery::Blog::Post.teaser_enabled_toggle!
           unless request.xhr?
-            redirect_back_or_default(refinery_blog_admin_posts_path)
+            redirect_back_or_default(main_app.refinery_blog_admin_posts_path)
           else
             render :json => {:enabled => enabled},
                    :layout => false
@@ -52,4 +52,4 @@ module Refinery
       end
     end
   end
-end
+end
\ No newline at end of file
-- 
cgit v1.2.3