enki_ticket_8.diff

gistfile1.txt

From cfbcb70ab0a17ed97355166b4cfcab3a9f323d67 Mon Sep 17 00:00:00 2001
From: James OKelly <[email protected]>
Date: Sun, 28 Nov 2010 21:51:59 -0800
Subject: [PATCH] fixed two failing json specs in admin/posts and admin/comments

---
 app/controllers/admin/pages_controller.rb |   10 ++++++----
 app/controllers/admin/posts_controller.rb |   10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index c12c89a..658f0d8 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -75,10 +75,12 @@ class Admin::PagesController < Admin::BaseController
       end
       format.json {
         render :json => {
-          :undo_path    => undo_admin_undo_item_path(undo_item),
-          :undo_message => undo_item.description,
-          :page         => @page
-        }.to_json
+          :data => {
+            :undo_path    => undo_admin_undo_item_path(undo_item),
+            :undo_message => undo_item.description,
+            :page         => @page
+          }
+        }
       }
     end
   end
diff --git a/app/controllers/admin/posts_controller.rb b/app/controllers/admin/posts_controller.rb
index 434d612..0875fb4 100644
--- a/app/controllers/admin/posts_controller.rb
+++ b/app/controllers/admin/posts_controller.rb
@@ -75,10 +75,12 @@ class Admin::PostsController < Admin::BaseController
       end
       format.json {
         render :json => {
-          :undo_path    => undo_admin_undo_item_path(undo_item),
-          :undo_message => undo_item.description,
-          :post         => @post
-        }.to_json
+          :data => {
+            :undo_path    => undo_admin_undo_item_path(undo_item),
+            :undo_message => undo_item.description,
+            :post         => @post
+          }
+        }
       }
     end
   end
-- 
1.7.3.2