aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Arndt <parndt@gmail.com>2011-09-05 01:37:17 -0700
committerPhilip Arndt <parndt@gmail.com>2011-09-05 01:37:17 -0700
commitcc3be37a41d9c3d97df1ef6649f7ed6f7a3766c0 (patch)
treee9b928ef91f7b50c098fd47acfb43edab541fdf3
parentd8f36a41962203a45a1a9ee7d52bad92b4066ebf (diff)
parent6be013e0c00d8ab965ff9a7933547bfb33eaebc8 (diff)
downloadrefinerycms-blog-cc3be37a41d9c3d97df1ef6649f7ed6f7a3766c0.tar.gz
refinerycms-blog-cc3be37a41d9c3d97df1ef6649f7ed6f7a3766c0.tar.bz2
refinerycms-blog-cc3be37a41d9c3d97df1ef6649f7ed6f7a3766c0.zip
Merge pull request #131 from wakeless/rails-3-1
Fix for ::Refinery::AdminController
-rw-r--r--app/controllers/refinery/admin/blog/categories_controller.rb2
-rw-r--r--app/controllers/refinery/admin/blog/comments_controller.rb2
-rw-r--r--app/controllers/refinery/admin/blog/posts_controller.rb2
-rw-r--r--app/controllers/refinery/admin/blog/settings_controller.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/refinery/admin/blog/categories_controller.rb b/app/controllers/refinery/admin/blog/categories_controller.rb
index 7196e8f..12f22ce 100644
--- a/app/controllers/refinery/admin/blog/categories_controller.rb
+++ b/app/controllers/refinery/admin/blog/categories_controller.rb
@@ -1,7 +1,7 @@
module Refinery
module Admin
module Blog
- class CategoriesController < ::Admin::BaseController
+ class CategoriesController < ::Refinery::AdminController
crudify :'refinery/blog_category',
:title_attribute => :title,
diff --git a/app/controllers/refinery/admin/blog/comments_controller.rb b/app/controllers/refinery/admin/blog/comments_controller.rb
index f14e8eb..a3df235 100644
--- a/app/controllers/refinery/admin/blog/comments_controller.rb
+++ b/app/controllers/refinery/admin/blog/comments_controller.rb
@@ -1,7 +1,7 @@
module Refinery
module Admin
module Blog
- class CommentsController < ::Admin::BaseController
+ class CommentsController < ::Refinery::AdminController
cache_sweeper Refinery::BlogSweeper
diff --git a/app/controllers/refinery/admin/blog/posts_controller.rb b/app/controllers/refinery/admin/blog/posts_controller.rb
index 17ebe87..0fb49ee 100644
--- a/app/controllers/refinery/admin/blog/posts_controller.rb
+++ b/app/controllers/refinery/admin/blog/posts_controller.rb
@@ -1,7 +1,7 @@
module Refinery
module Admin
module Blog
- class PostsController < ::Admin::BaseController
+ class PostsController < ::Refinery::AdminController
cache_sweeper Refinery::BlogSweeper
diff --git a/app/controllers/refinery/admin/blog/settings_controller.rb b/app/controllers/refinery/admin/blog/settings_controller.rb
index 469a1dc..1894ac6 100644
--- a/app/controllers/refinery/admin/blog/settings_controller.rb
+++ b/app/controllers/refinery/admin/blog/settings_controller.rb
@@ -1,7 +1,7 @@
module Refinery
module Admin
module Blog
- class SettingsController < ::Admin::BaseController
+ class SettingsController < ::Refinery::AdminController
def notification_recipients
@recipients = Refinery::BlogComment::Notification.recipients