From dbd2561fe613ca5e0cefb95d491143aeafab3800 Mon Sep 17 00:00:00 2001 From: Michael Pope Date: Mon, 15 Aug 2011 10:30:59 +1000 Subject: fixed listing of uncategorized posts --- app/controllers/admin/blog/posts_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/admin/blog/posts_controller.rb b/app/controllers/admin/blog/posts_controller.rb index c8dfc13..b2f2a79 100644 --- a/app/controllers/admin/blog/posts_controller.rb +++ b/app/controllers/admin/blog/posts_controller.rb @@ -1,7 +1,7 @@ module Admin module Blog class PostsController < Admin::BaseController - + require 'will_paginate/array' crudify :blog_post, :title_attribute => :title, @@ -94,4 +94,4 @@ module Admin end end end -end \ No newline at end of file +end -- cgit v1.2.3 From 20cffcee84c407a40943f616db0aa3678b45a19f Mon Sep 17 00:00:00 2001 From: Marek Date: Sun, 11 Sep 2011 00:10:07 +0200 Subject: canonical tag for posts --- app/controllers/blog/posts_controller.rb | 34 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/blog/posts_controller.rb b/app/controllers/blog/posts_controller.rb index edac5ab..5ec6ec1 100644 --- a/app/controllers/blog/posts_controller.rb +++ b/app/controllers/blog/posts_controller.rb @@ -9,7 +9,7 @@ module Blog def index # Rss feeders are greedy. Let's give them every blog post instead of paginating. - (@blog_posts = BlogPost.live.includes(:comments, :categories).all) if request.format.rss? + (@blog_posts = BlogPost.live.includes(:comments, :categories).all) if request.format.rss? respond_with (@blog_posts) do |format| format.html format.rss @@ -18,6 +18,7 @@ module Blog def show @blog_comment = BlogComment.new + @canonical = url_for(:locale => ::Refinery::I18n.default_frontend_locale) if canonical? respond_with (@blog_post) do |format| format.html { present(@blog_post) } @@ -41,7 +42,7 @@ module Blog else flash[:notice] = t('thank_you', :scope => 'blog.posts.comments') redirect_to blog_post_url(params[:id], - :anchor => "comment-#{@blog_comment.to_param}") + :anchor => "comment-#{@blog_comment.to_param}") end else render :action => 'show' @@ -54,17 +55,17 @@ module Blog @archive_date = Time.parse(date) @date_title = @archive_date.strftime('%B %Y') @blog_posts = BlogPost.live.by_archive(@archive_date).paginate({ - :page => params[:page], - :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) - }) + :page => params[:page], + :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) + }) else date = "01/#{params[:year]}" @archive_date = Time.parse(date) @date_title = @archive_date.strftime('%Y') @blog_posts = BlogPost.live.by_year(@archive_date).paginate({ - :page => params[:page], - :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) - }) + :page => params[:page], + :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) + }) end respond_with (@blog_posts) end @@ -73,12 +74,12 @@ module Blog @tag = ActsAsTaggableOn::Tag.find(params[:tag_id]) @tag_name = @tag.name @blog_posts = BlogPost.tagged_with(@tag_name).paginate({ - :page => params[:page], - :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) - }) + :page => params[:page], + :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) + }) end - protected + protected def find_blog_post unless (@blog_post = BlogPost.find(params[:id])).try(:live?) @@ -92,14 +93,17 @@ module Blog def find_all_blog_posts @blog_posts = BlogPost.live.includes(:comments, :categories).paginate({ - :page => params[:page], - :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) - }) + :page => params[:page], + :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) + }) end def find_tags @tags = BlogPost.tag_counts_on(:tags) end + def canonical? + ::Refinery.i18n_enabled? && ::Refinery::I18n.default_frontend_locale != ::Refinery::I18n.current_frontend_locale + end end end \ No newline at end of file -- cgit v1.2.3 From c1903f5797300202f15a4cd34ec7ded9c9f4fd9d Mon Sep 17 00:00:00 2001 From: Marek Date: Sun, 11 Sep 2011 01:53:01 +0200 Subject: fix corrupted indentation --- app/controllers/blog/posts_controller.rb | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/blog/posts_controller.rb b/app/controllers/blog/posts_controller.rb index 5ec6ec1..7eb167d 100644 --- a/app/controllers/blog/posts_controller.rb +++ b/app/controllers/blog/posts_controller.rb @@ -19,7 +19,7 @@ module Blog def show @blog_comment = BlogComment.new @canonical = url_for(:locale => ::Refinery::I18n.default_frontend_locale) if canonical? - + respond_with (@blog_post) do |format| format.html { present(@blog_post) } format.js { render :partial => 'post', :layout => false } @@ -42,7 +42,7 @@ module Blog else flash[:notice] = t('thank_you', :scope => 'blog.posts.comments') redirect_to blog_post_url(params[:id], - :anchor => "comment-#{@blog_comment.to_param}") + :anchor => "comment-#{@blog_comment.to_param}") end else render :action => 'show' @@ -55,17 +55,17 @@ module Blog @archive_date = Time.parse(date) @date_title = @archive_date.strftime('%B %Y') @blog_posts = BlogPost.live.by_archive(@archive_date).paginate({ - :page => params[:page], - :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) - }) + :page => params[:page], + :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) + }) else date = "01/#{params[:year]}" @archive_date = Time.parse(date) @date_title = @archive_date.strftime('%Y') @blog_posts = BlogPost.live.by_year(@archive_date).paginate({ - :page => params[:page], - :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) - }) + :page => params[:page], + :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) + }) end respond_with (@blog_posts) end @@ -74,12 +74,12 @@ module Blog @tag = ActsAsTaggableOn::Tag.find(params[:tag_id]) @tag_name = @tag.name @blog_posts = BlogPost.tagged_with(@tag_name).paginate({ - :page => params[:page], - :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) - }) + :page => params[:page], + :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) + }) end - protected + protected def find_blog_post unless (@blog_post = BlogPost.find(params[:id])).try(:live?) @@ -93,15 +93,15 @@ module Blog def find_all_blog_posts @blog_posts = BlogPost.live.includes(:comments, :categories).paginate({ - :page => params[:page], - :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) - }) + :page => params[:page], + :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10) + }) end def find_tags @tags = BlogPost.tag_counts_on(:tags) end - + def canonical? ::Refinery.i18n_enabled? && ::Refinery::I18n.default_frontend_locale != ::Refinery::I18n.current_frontend_locale end -- cgit v1.2.3