Supported Rails 4 and Refinery 3.0.0.dev

1 files changed, 27 insertions, 16 deletions

diff --git a/app/helpers/refinery/blog/controller_helper.rb b/app/helpers/refinery/blog/controller_helper.rb
index 87d5447..75c351a 100644
--- a/app/helpers/refinery/blog/controller_helper.rb
+++ b/app/helpers/refinery/blog/controller_helper.rb
@@ -4,26 +4,37 @@ module Refinery
 
       protected
 
-        def find_blog_post
-          unless (@post = Refinery::Blog::Post.with_globalize.find(params[:id])).try(:live?)
-            if refinery_user? and current_refinery_user.authorized_plugins.include?("refinerycms_blog")
-              @post = Refinery::Blog::Post.find(params[:id])
-            else
-              error_404
-            end
+      def find_blog_post
+        @post = all_blog_posts.friendly.find(params[:id])
+        unless @post.try(:live?)
+          if refinery_user? && current_refinery_user.authorized_plugins.include?("refinerycms_blog")
+            @post = Post.friendly.find(params[:id])
+          else
+            error_404
           end
         end
+      end
 
-        def find_all_blog_posts
-          @posts = Refinery::Blog::Post.live.includes(:comments, :categories).with_globalize.page(params[:page])
-        end
+      def find_all_blog_posts
+        @posts = all_blog_posts.live
+      end
 
-        def find_tags
-          @tags = Refinery::Blog::Post.tag_counts_on(:tags)
-        end
-        def find_all_blog_categories
-          @categories = Refinery::Blog::Category.translated
-        end
+      def paginate_all_blog_posts
+        @posts = find_all_blog_posts.page(params[:page])
+      end
+
+      def find_tags
+        @tags = Post.tag_counts_on(:tags)
+      end
+
+      def find_all_blog_categories
+        @categories = Category.translated
+      end
+
+      private
+      def all_blog_posts
+        Post.newest_first.includes(:comments, :categories).with_globalize
+      end
     end
   end
 end