diff options
| author | Adrien Coquio <adrien.coquio@gmail.com> | 2012-06-03 21:37:41 +0200 |
|---|---|---|
| committer | Philip Arndt <parndt@gmail.com> | 2012-06-09 11:19:38 +1200 |
| commit | d0c249af2a2e630ac993eb23a691ef996613b55f (patch) | |
| tree | 6992cf3816a6f5b1e022637a6780a7d24f1753cf /app/controllers/refinery/blog | |
| parent | 7743fab73a5c60d9f5f0cf2ce65a3f0914b1376f (diff) | |
| download | refinerycms-blog-d0c249af2a2e630ac993eb23a691ef996613b55f.tar.gz refinerycms-blog-d0c249af2a2e630ac993eb23a691ef996613b55f.tar.bz2 refinerycms-blog-d0c249af2a2e630ac993eb23a691ef996613b55f.zip | |
Added i18n support to models through globalize3.
* Added Post translation
* Added Category translation
* Use friendly_id globalize with category
* Added migrate_data option on migrations for translations
* Use Refinery locale instead of I18n
* Refactored duplicate locale_picker partial
* Removed useless .all call
* Use presence instead if / blank?
* Added with_globalize scopes when loading posts of one category
* Use Globalize when creating post factory
* Fix failing specs by creating blog posts/categories using needed locale.
Diffstat (limited to 'app/controllers/refinery/blog')
| -rw-r--r-- | app/controllers/refinery/blog/admin/posts_controller.rb | 7 | ||||
| -rw-r--r-- | app/controllers/refinery/blog/categories_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/refinery/blog/posts_controller.rb | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/controllers/refinery/blog/admin/posts_controller.rb b/app/controllers/refinery/blog/admin/posts_controller.rb index b379a24..e48c00d 100644 --- a/app/controllers/refinery/blog/admin/posts_controller.rb +++ b/app/controllers/refinery/blog/admin/posts_controller.rb @@ -6,7 +6,8 @@ module Refinery cache_sweeper Refinery::BlogSweeper crudify :'refinery/blog/post', - :order => 'published_at DESC' + :order => 'published_at DESC', + :include => [:translations] before_filter :find_all_categories, :only => [:new, :edit, :create, :update] @@ -77,6 +78,10 @@ module Refinery end protected + def find_post + @post = Refinery::Blog::Post.find_by_slug_or_id(params[:id]) + end + def find_all_categories @categories = Refinery::Blog::Category.find(:all) end diff --git a/app/controllers/refinery/blog/categories_controller.rb b/app/controllers/refinery/blog/categories_controller.rb index 467726e..23a835a 100644 --- a/app/controllers/refinery/blog/categories_controller.rb +++ b/app/controllers/refinery/blog/categories_controller.rb @@ -4,7 +4,7 @@ module Refinery def show @category = Refinery::Blog::Category.find(params[:id]) - @posts = @category.posts.live.includes(:comments, :categories).page(params[:page]) + @posts = @category.posts.live.includes(:comments, :categories).with_globalize.page(params[:page]) end end diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index caa46ec..bb242fd 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -12,7 +12,7 @@ module Refinery def index # Rss feeders are greedy. Let's give them every blog post instead of paginating. - (@posts = Post.live.includes(:comments, :categories).all) if request.format.rss? + (@posts = Post.live.includes(:comments, :categories).with_globalize) if request.format.rss? respond_with (@posts) do |format| format.html format.rss @@ -22,7 +22,7 @@ module Refinery def show @comment = Comment.new - @canonical = url_for(:locale => ::Refinery::I18n.default_frontend_locale) if canonical? + @canonical = refinery.url_for(:locale => Refinery::I18n.current_frontend_locale) if canonical? @post.increment!(:access_count, 1) |