refinerycms-pages 0.9.9.16 → 0.9.9.17

data/app/controllers/admin/pages_controller.rb

@@ -27,16 +27,15 @@ module Admin
         super
 
         # 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?
-          if @page.slug.nil? and @page.slugs.length > 0
-            @page.slug = @page.slugs[0]
-          end
-          if @page.slug
-            Thread.current[:globalize_locale] = @page.slug.locale
-          end
+        unless params[:switch_locale] || @page.nil? || @page.new_record? || @page.slugs.where({
+          :locale => Refinery::I18n.current_locale}
+        ).nil?
+          @page.slug = @page.slugs.first if @page.slug.nil? && @page.slugs.any?
+          Thread.current[:globalize_locale] = @page.slug.locale if @page.slug
         end
       else
-        Thread.current[:globalize_locale] = nil
+        # Always display the tree of pages from the default frontend locale.
+        Thread.current[:globalize_locale] = params[:switch_locale].try(:to_sym) || ::Refinery::I18n.default_frontend_locale
       end
     end
 

data/app/controllers/admin/pages_dialogs_controller.rb

@@ -3,8 +3,6 @@ require 'net/http'
 module Admin
   class PagesDialogsController < Admin::DialogsController
 
-    crudify :page
-
     def link_to
       @pages = Page.paginate :page => params[:page],
                              :conditions => {:parent_id => nil},

data/app/models/page.rb

@@ -4,27 +4,39 @@ class Page < ActiveRecord::Base
 
   translates :title, :meta_keywords, :meta_description, :browser_title, :custom_title if self.respond_to?(:translates)
 
-  # Set up support for meta tags through translations.
-  if defined?(::Page::Translation) && ::Page::Translation.table_exists?
-    def translation
-      if @translation.nil? or @translation.try(:locale) != ::Globalize.locale
-        @translation = translations.with_locale(::Globalize.locale).first
-        @translation ||= translations.build(:locale => ::Globalize.locale)
-      end
+  attr_accessible :id, :deletable, :link_url, :menu_match, :meta_keywords,
+                  :skip_to_first_child, :position, :show_in_menu, :draft,
+                  :parts_attributes, :browser_title, :meta_description,
+                  :custom_title_type, :parent_id, :custom_title,
+                  :created_at, :updated_at, :page_id
 
-      @translation
+  # Set up support for meta tags through translations.
+  if defined?(::Page::Translation)
+    attr_accessible :title
+    # set allowed attributes for mass assignment
+    ::Page::Translation.module_eval do
+      attr_accessible :browser_title, :meta_description, :meta_keywords,
+                      :locale
     end
+    if ::Page::Translation.table_exists?
+      def translation
+        if @translation.nil? or @translation.try(:locale) != ::Globalize.locale
+          @translation = translations.with_locale(::Globalize.locale).first
+          @translation ||= translations.build(:locale => ::Globalize.locale)
+        end
+
+        @translation
+      end
 
     # Instruct the Translation model to have meta tags.
-    ::Page::Translation.module_eval do
-      is_seo_meta
-    end
+    ::Page::Translation.send :is_seo_meta
 
-    # Delegate all SeoMeta attributes to the active translation.
-    fields = ::SeoMeta.attributes.keys.map{|a| [a, :"#{a}="]}.flatten
-    fields << {:to => :translation}
-    delegate *fields
-    after_save proc {|m| m.translation.save}
+      # Delegate all SeoMeta attributes to the active translation.
+      fields = ::SeoMeta.attributes.keys.map{|a| [a, :"#{a}="]}.flatten
+      fields << {:to => :translation}
+      delegate *fields
+      after_save proc {|m| m.translation.save}
+    end
   end
 
   attr_accessor :locale # to hold temporarily
@@ -36,13 +48,15 @@ class Page < ActiveRecord::Base
   has_friendly_id :title, :use_slug => true,
                   :default_locale => (::Refinery::I18n.default_frontend_locale rescue :en),
                   :reserved_words => %w(index new session login logout users refinery admin images wymiframe),
-                  :approximate_ascii => RefinerySetting.find_or_set(:approximate_ascii, false, :scoping => "pages")
+                  :approximate_ascii => RefinerySetting.find_or_set(:approximate_ascii, false, :scoping => "pages"),
+                  :strip_non_ascii => RefinerySetting.find_or_set(:strip_non_ascii, false, :scoping => "pages")
 
   has_many :parts,
            :class_name => "PagePart",
            :order => "position ASC",
            :inverse_of => :page,
-           :dependent => :destroy
+           :dependent => :destroy,
+           :include => :translations
 
   accepts_nested_attributes_for :parts, :allow_destroy => true
 
@@ -54,19 +68,25 @@ class Page < ActiveRecord::Base
   after_save :reposition_parts!, :invalidate_child_cached_url, :expire_page_caching
   after_destroy :expire_page_caching
 
-  scope :live, where(:draft => false)
-  scope :by_title, lambda {|t|
-    where(:id => Page::Translation.where(:locale => Globalize.locale, :title => t).map(&:page_id))
+  # Wrap up the logic of finding the pages based on the translations table.
+  scope :with_globalize, lambda {|t|
+    if defined?(::Page::Translation)
+      t = {:locale => Globalize.locale}.merge(t || {})
+      where(:id => ::Page::Translation.where(t).select('page_id AS id'))
+    else
+      where(t)
+    end
   }
 
+  scope :live, where(:draft => false)
+  scope :by_title, lambda {|t| with_globalize(:title => t)}
+
   # Shows all pages with :show_in_menu set to true, but it also
   # rejects any page that has not been translated to the current locale.
   # 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).includes(:translations).where(
-      :id => Page::Translation.where(:locale => Globalize.locale).map(&:page_id)
-    )
+    where(:show_in_menu => true).with_globalize({})
   }
 
   # when a dialog pops up to link to a page, how many pages per page should there be
@@ -293,10 +313,10 @@ class Page < ActiveRecord::Base
 
   # In the admin area we use a slightly different title to inform the which pages are draft or hidden pages
   def title_with_meta
-    if self.title.nil?
-      title = [::Page::Translation.where(:page_id => self.id).first.title.to_s]
+    title = if self.title.nil?
+      [::Page::Translation.where(:page_id => self.id, :locale => Globalize.locale).first.try(:title).to_s]
     else
-      title = [self.title.to_s]
+      [self.title.to_s]
     end
 
     title << "<em>(#{::I18n.t('hidden', :scope => 'admin.pages.page')})</em>" unless show_in_menu?

data/app/models/page_part.rb

@@ -1,5 +1,7 @@
 class PagePart < ActiveRecord::Base
 
+  attr_accessible :title, :content, :position, :body, :created_at,
+                  :updated_at, :page_id
   belongs_to :page
 
   validates :title, :presence => true
@@ -12,7 +14,11 @@ class PagePart < ActiveRecord::Base
   end
 
   before_save :normalise_text_fields
-
+  if defined?(::PagePart::Translation)
+    ::PagePart::Translation.module_eval do
+      attr_accessible :locale
+    end
+  end
 protected
   def normalise_text_fields
     unless body.blank? or body =~ /^\</

data/app/views/admin/pages_dialogs/link_to.html.erb

@@ -109,7 +109,7 @@
           <%= will_paginate @resources,
                             :param_name => :resource_page,
                             :renderer => Refinery::LinkRenderer,
-                            :url => {:paginating => "resource_file"},
+                            :params => {:paginating => "resource_file"},
                             :id => 'resouces_paginate' %>
         </div>
       </div>

data/lib/gemspec.rb

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   ]
 
   s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
-  s.add_dependency 'seo_meta',         '~> 1.0.3'
+  s.add_dependency 'seo_meta',         '~> 1.0.4'
 end
 EOF
 

data/lib/refinery/pages/instance_methods.rb

@@ -15,7 +15,7 @@ module Refinery
 
     protected
       def find_pages_for_menu
-        @menu_pages = Page.in_menu.live.order('lft ASC').includes(:slugs)
+        @menu_pages = Page.live.in_menu.order('lft ASC').includes(:slugs)
       end
 
       def render(*args)

data/lib/refinerycms-pages.rb

@@ -36,7 +36,7 @@ module Refinery
         ::Refinery::Plugin.register do |plugin|
           plugin.name = "refinery_pages"
           plugin.directory = "pages"
-          plugin.version = %q{0.9.9.13}
+          plugin.version = %q{0.9.9.17}
           plugin.menu_match = /(refinery|admin)\/page(_part)?s(_dialogs)?$/
           plugin.activity = {
             :class => Page,

data/refinerycms-pages.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{0.9.9.16}
+  s.version           = %q{0.9.9.17}
   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-04-07}
+  s.date              = %q{2011-04-15}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -117,6 +117,6 @@ Gem::Specification.new do |s|
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core', '= 0.9.9.16'
-  s.add_dependency 'seo_meta',         '~> 1.0.3'
+  s.add_dependency 'refinerycms-core', '= 0.9.9.17'
+  s.add_dependency 'seo_meta',         '~> 1.0.4'
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.16
+  version: 0.9.9.17
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,8 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 +12:00
-default_executable: 
+date: 2011-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -24,7 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.16
+        version: 0.9.9.17
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +34,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.3
+        version: 1.0.4
   type: :runtime
   version_requirements: *id002
 description: The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.
@@ -120,7 +119,6 @@ files:
 - license.md
 - refinerycms-pages.gemspec
 - spec/models/page_spec.rb
-has_rdoc: true
 homepage: http://refinerycms.com
 licenses: 
 - MIT
@@ -144,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.6.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Pages engine for Refinery CMS