refinerycms-pages 0.9.9.9 → 0.9.9.10

data/app/controllers/admin/pages_controller.rb

@@ -20,18 +20,24 @@ module Admin
 
   protected
 
+    # We can safely assume Refinery::I18n is defined because this method only gets
+    # Invoked when the before_filter from the plugin is run.
     def globalize!
-      super
+      unless action_name.to_s == 'index'
+        super
 
-      # Check whether we need to override e.g. on the pages form.
-      unless params[:switch_locale] or @page.try(:slug).nil? or !@page.persisted?
-        Thread.current[:globalize_locale] = @page.slug.locale
+        # Check whether we need to override e.g. on the pages form.
+        unless params[:switch_locale] or @page.nil? or @page.slugs.where(:locale => Refinery::I18n.current_locale).nil? or !@page.persisted?
+          Thread.current[:globalize_locale] = @page.slug.locale
+        end
+      else
+        Thread.current[:globalize_locale] = nil
       end
     end
 
     def show_errors_for_reserved_slug(exception)
       flash[:error] = t('reserved_system_word', :scope => 'admin.pages')
-      if params[:action] == 'update'
+      if action_name == 'update'
         find_page
         render :edit
       else

data/app/models/page.rb

@@ -40,7 +40,7 @@ class Page < ActiveRecord::Base
   # This works using a query against the translated content first and then
   # using all of the page_ids we further filter against this model's table.
   scope :in_menu, lambda {
-    where(:show_in_menu => true).joins(:translations).includes(:translations).where(
+    where(:show_in_menu => true).includes(:translations).where(
       :id => Page::Translation.where(:locale => Globalize.locale).map(&:page_id)
     )
   }

data/app/views/admin/pages/_sortable_list.html.erb

@@ -3,7 +3,7 @@
              :collection => @pages.select{|p| p.parent_id.nil?},
              :locals => {
                :collection => @pages
-             },  %>
+             }  %>
 </ul>
 <%= render :partial => "/shared/admin/sortable_list",
            :locals => {:continue_reordering => !!local_assigns[:continue_reordering]} %>

data/app/views/admin/pages/index.html.erb

@@ -1,6 +1,6 @@
 <section id='records' class='tree'>
   <% caching = RefinerySetting.find_or_set(:cache_pages_backend, false) && File.writable?(Rails.cache.cache_path) %>
-  <% cache_if(caching, [Refinery.base_cache_key, "pages_backend", Globalize.locale].join('_')) do %>
+  <% cache_if(caching && !logged_in?, [Refinery.base_cache_key, "pages_backend", Globalize.locale].join('_')) do %>
     <%= render :partial => 'records' %>
   <% end %>
 </section>

data/db/migrate/20110307025652_translate_custom_title_on_pages.rb

@@ -9,16 +9,9 @@ class TranslateCustomTitleOnPages < ActiveRecord::Migration
       end
 
     end
-
-    if ::Page.column_names.map(&:to_sym).include?(:custom_title)
-      remove_column ::Page.table_name, :custom_title
-    end
   end
 
   def self.down
-    # Restore
-    add_column ::Page.table_name, :custom_title, :string
-
     # Re-save custom_title
     ::Page.all.each do |page|
       ::Page.update_all({

data/refinerycms-pages.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{0.9.9.9}
+  s.version           = %q{0.9.9.10}
   s.summary           = %q{Pages engine for Refinery CMS}
   s.description       = %q{The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.}
-  s.date              = %q{2011-03-15}
+  s.date              = %q{2011-03-17}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -111,5 +111,5 @@ Gem::Specification.new do |s|
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core', '~> 0.9.9.9'
+  s.add_dependency 'refinerycms-core', '~> 0.9.9.10'
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.9
+  version: 0.9.9.10
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +13:00
+date: 2011-03-17 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.9
+        version: 0.9.9.10
   type: :runtime
   version_requirements: *id001
 description: The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.