refinerycms-pages 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '09bcb164f233eb9e0139cec096762c44bdb0633a'
-  data.tar.gz: 663a3ed2390bf1f68b828000655a780c70755cfe
+SHA256:
+  metadata.gz: ae17335fe58d0639787e9ce4b9a3b35087d9e0fb6e8022d1177ab875334d8af6
+  data.tar.gz: b2ea953d3fdbd2d81aacb589628ad17d65e72b7193808cee8eeaf256fcaa69b4
 SHA512:
-  metadata.gz: 99fb3481b27dce69ceec963ac413f1c9ee15216a6d6a4de818597d94c43d5b3b84df0ac1f40d254c79a22830093c5927c94f1a55679be77cf1f4618e9684c8cb
-  data.tar.gz: aeb2b2af427ea62b1dece0f277c97bda0c50cc68bd4781a1a2221baba45faa7d5695e72483552ce13a7ac8bf09e21a6b69c1b95465432c56012d84f27fff37c3
+  metadata.gz: ddaea6f897999904cb366edf108b92ff87a37842dda38815388d7a040c9ec9f954c6ff29bfa218f237097707d0f50b5253e6cd580416b5cb7ff23f1112daf7b6
+  data.tar.gz: d5faab462239c5f137770f046e29062b246b4c646d6b3fe126ddc8b891c57ee8f23444edf098f5a19a6789995755e9bc3f6be08b5e49906725053295eaca29fa

data/app/controllers/refinery/admin/page_parts_controller.rb

@@ -1,6 +1,7 @@
 module Refinery
   module Admin
     class PagePartsController < ::Refinery::AdminController
+      skip_after_action :store_location?, raise: false
 
       def new
         render :partial => '/refinery/admin/pages/page_part_field', :locals => {
@@ -28,7 +29,7 @@ module Refinery
 
       private
         def permitted_new_page_part_params
-          [:title, :slug, :body, :locale]
+          [:title, :slug, :body]
         end
     end
   end

data/app/controllers/refinery/admin/pages_controller.rb

@@ -1,17 +1,18 @@
 module Refinery
   module Admin
     class PagesController < Refinery::AdminController
-      prepend Pages::InstanceMethods
+      prepend Refinery::Pages::InstanceMethods
 
       crudify :'refinery/page',
-              :include => [:translations, :children],
-              :paging => false
+              include: [:translations, :children],
+              paging: false,
+              exclude_from_find: [:show]
 
       helper_method :valid_layout_templates, :valid_view_templates
 
       def new
         @page = Page.new(new_page_params)
-        Pages.default_parts_for(@page).each_with_index do |page_part, index|
+        Refinery::Pages.default_parts_for(@page).each_with_index do |page_part, index|
           @page.parts << PagePart.new(:title => page_part[:title], :slug => page_part[:slug], :position => index)
         end
       end
@@ -22,7 +23,7 @@ module Refinery
       end
 
       def update
-        if @page.update_attributes(page_params)
+        if @page.update(page_params)
           flash.notice = t('refinery.crudify.updated', what: "'#{@page.title}'")
 
           if from_dialog?
@@ -35,7 +36,7 @@ module Refinery
                 render partial: 'save_and_continue_callback',
                        locals: save_and_continue_locals(@page)
               else
-                redirect_to :back
+                redirect_back(fallback_location: { action: 'edit' })
               end
             else
               redirect_back_or_default(refinery.admin_pages_path)
@@ -67,23 +68,23 @@ module Refinery
 
       # We can safely assume ::Refinery::I18n is defined because this method only gets
       # Invoked when the before_action from the plugin is run.
-      def globalize!
+      def mobility!
         return super unless action_name.to_s == 'index'
 
         # Always display the tree of pages from the default frontend locale.
         if Refinery::I18n.built_in_locales.keys.map(&:to_s).include?(params[:switch_locale])
-          Globalize.locale = params[:switch_locale].try(:to_sym)
+          Mobility.locale = params[:switch_locale].try(:to_sym)
         else
-          Globalize.locale = Refinery::I18n.default_frontend_locale
+          Mobility.locale = Refinery::I18n.default_frontend_locale
         end
       end
 
       def valid_layout_templates
-        Pages.layout_template_whitelist & Pages.valid_templates(*Pages.layout_templates_pattern)
+        Refinery::Pages.layout_template_whitelist & Refinery::Pages.valid_templates(*Refinery::Pages.layout_templates_pattern)
       end
 
       def valid_view_templates
-        Pages.valid_templates(*Pages.view_templates_pattern)
+        Refinery::Pages.valid_templates(*Refinery::Pages.view_templates_pattern)
       end
 
       def page_params

data/app/controllers/refinery/admin/pages_dialogs_controller.rb

@@ -6,16 +6,16 @@ module Refinery
 
       def link_to
         # Get the switch_local variable to determine the locale we're currently editing
-        # Set up Globalize with our current locale
-        Globalize.locale = if params[:switch_locale].present? && Refinery::I18n.built_in_locales.keys.map(&:to_s).include?(params[:switch_locale])
-          Globalize.locale = params[:switch_locale]
+        # Set up Mobility with our current locale
+        Mobility.locale = if params[:switch_locale].present? && Refinery::I18n.built_in_locales.keys.map(&:to_s).include?(params[:switch_locale])
+          Mobility.locale = params[:switch_locale]
         else
           Refinery::I18n.default_locale
         end
 
         @pages = ::Refinery::Page.roots.paginate(:page => params[:page], :per_page => ::Refinery::Page.per_page(true))
 
-        @pages = @pages.with_globalize
+        @pages = @pages.with_mobility
 
         if ::Refinery::Plugins.registered.names.include?('refinery_files')
           @resources = Resource.paginate(:page => params[:resource_page], :per_page => Resource.per_page(true)).
@@ -28,8 +28,8 @@ module Refinery
         end
 
         # web address link
-        @web_address_text = "http://"
-        @web_address_text = params[:current_link] if params[:current_link].to_s =~ /^http:\/\//
+        @web_address_text = "https://"
+        @web_address_text = params[:current_link] if params[:current_link].to_s =~ /^https?:\/\//
         @web_address_target_blank = (params[:target_blank] == "true")
 
         # mailto link
@@ -45,8 +45,8 @@ module Refinery
           @page_area_selected = (params[:paginating] == "your_page")
           @resource_area_selected = (params[:paginating] == "resource_file")
         else
-          @page_area_selected = (!is_resource_link and @web_address_text == "http://" and @email_address_text.blank?)
-          @web_address_area_selected = (@web_address_text != "http://")
+          @page_area_selected = (!is_resource_link and @web_address_text == "https://" and @email_address_text.blank?)
+          @web_address_area_selected = (@web_address_text != "https://")
           @email_address_area_selected = @email_address_text.present?
           @resource_area_selected = is_resource_link
         end

data/app/controllers/refinery/pages/admin/preview_controller.rb

@@ -9,6 +9,9 @@ module Refinery
         include Pages::RenderOptions
 
         skip_before_action :error_404, :set_canonical
+        skip_after_action :store_location?, raise: false
+
+        layout :layout
 
         def show
           render_with_templates?
@@ -44,6 +47,10 @@ module Refinery
             :layout_template, :custom_slug, parts_attributes: [:id, :title, :slug, :body, :position]
           ]
         end
+
+        def layout
+          'application'
+        end
       end
     end
   end

data/app/controllers/refinery/pages_controller.rb

@@ -10,6 +10,9 @@ module Refinery
 
     # This action is usually accessed with the root path, normally '/'
     def home
+      if page.link_url.present? && page.link_url != "/"
+        redirect_to page.link_url, status: 301 and return
+      end
       render_with_templates?
     end
 
@@ -101,7 +104,7 @@ module Refinery
     module Finders
       class Home
         def self.call(_params)
-          Refinery::Page.find_by link_url: "/"
+          Refinery::Page.find_by link_url: Refinery::Pages.home_page_path
         end
       end
 

data/app/helpers/refinery/admin/pages_helper.rb

@@ -3,22 +3,26 @@ module Refinery
     module PagesHelper
       def parent_id_nested_set_options(current_page)
         pages = []
-        nested_set_options(::Refinery::Page, current_page) { |page| pages << page}
+        nested_set_options(::Refinery::Page, current_page) { |page| pages << page }
         # page.title needs the :translations association, doing something like
         # nested_set_options(::Refinery::Page.includes(:translations), page) doesn't work, yet.
         # See https://github.com/collectiveidea/awesome_nested_set/pull/123
-        ActiveRecord::Associations::Preloader.new.preload(pages, :translations)
-        pages.map { |page| ["#{'-' * page.level} #{page.title}", page.id]}
+        if Rails::VERSION::MAJOR >= 7
+          ActiveRecord::Associations::Preloader.new(records: pages, associations: :translations).call
+        else
+          ActiveRecord::Associations::Preloader.new.preload(pages, :translations)
+        end
+        pages.map { |page| ["#{'-' * page.level} #{page.title}", page.id] }
       end
 
       def template_options(template_type, current_page)
-        html_options = { :selected => send("default_#{template_type}", current_page) }
+        html_options = { selected: send("default_#{template_type}", current_page) }
 
         if (template = current_page.send(template_type).presence)
-          html_options.update :selected => template
+          html_options.update selected: template
         elsif current_page.parent_id? && !current_page.send(template_type).presence
           template = current_page.parent.send(template_type).presence
-          html_options.update :selected => template if template
+          html_options.update selected: template if template
         end
 
         html_options
@@ -52,7 +56,25 @@ module Refinery
           ::I18n.t('draft', :scope => 'refinery.admin.pages.page')
         end if page.draft?
 
-        meta_information
+        tag.span meta_information, class: :meta
+      end
+
+      def page_icon(number_of_children)
+        # 1. has_children 'folder|folderopen', 'toggle'
+        # 2. no_children 'page'
+
+        # .toggle scss handles adding icons to pages with children
+        classes = ['icon']
+        if number_of_children.zero?
+          classes.push icon_class('page')
+          title = ::I18n.t('edit', scope: 'refinery.admin.pages.page')
+        else
+          expanded_class = Refinery::Pages.auto_expand_admin_tree ? 'expanded' : ''
+          classes.push 'toggle', expanded_class
+          title = ::I18n.t('expand_collapse', scope: 'refinery.admin.pages')
+        end
+
+        tag.span(class: classes.join(' '), title: title)
       end
     end
   end

data/app/models/refinery/page.rb

@@ -1,74 +1,62 @@
 # Encoding: utf-8
 require 'friendly_id'
+require 'friendly_id/mobility'
 require 'refinery/core/base_model'
 require 'refinery/pages/url'
 require 'refinery/pages/finder'
 
 module Refinery
   class Page < Core::BaseModel
-    extend FriendlyId
-
-    translates :title, :menu_title, :custom_slug, :slug, :include => :seo_meta
-
-    attribute :title
-    attribute :menu_title
-    attribute :custom_slug
-    attribute :slug
+    extend Mobility
+    translates :title, :menu_title, :custom_slug, :slug, :browser_title, :meta_description
 
-    after_save { translations.collect(&:save) }
+    after_save { translations.in_locale(Mobility.locale).seo_meta.save! }
 
     class Translation
       is_seo_meta
-
-      def self.seo_fields
-        ::SeoMeta.attributes.keys.map{ |a| [a, :"#{a}="]}.flatten
-      end
     end
 
+    has_many :parts, -> {
+      scope = ::Refinery::PagePart.respond_to?(:mobility) ? i18n.includes(:translations) : all
+      scope = scope.order('position ASC')
+      scope
+    },       :foreign_key => :refinery_page_id,
+             :class_name => '::Refinery::PagePart',
+             :inverse_of => :page,
+             :dependent => :destroy
+
+    accepts_nested_attributes_for :parts, :allow_destroy => true
+
+    # Docs for acts_as_nested_set https://github.com/collectiveidea/awesome_nested_set
+    # rather than :delete_all we want :destroy
+    acts_as_nested_set :dependent => :destroy
+
     class FriendlyIdOptions
       def self.options
         # Docs for friendly_id https://github.com/norman/friendly_id
         friendly_id_options = {
-          use: [:reserved],
+          use: [:mobility, :reserved],
           reserved_words: Refinery::Pages.friendly_id_reserved_words
         }
         if ::Refinery::Pages.scope_slug_by_parent
           friendly_id_options[:use] << :scoped
           friendly_id_options.merge!(scope: :parent)
         end
-        friendly_id_options[:use] << :globalize
+
         friendly_id_options
       end
     end
 
+    extend FriendlyId
+    friendly_id :custom_slug_or_title, FriendlyIdOptions.options
+
     # If title changes tell friendly_id to regenerate slug when saving record
     def should_generate_new_friendly_id?
-      changes.keys.include?("title") || changes.keys.include?("custom_slug")
+      title_changed? || custom_slug_changed?
     end
 
-    # Delegate SEO Attributes to globalize translation
-    delegate(*(Translation.seo_fields << {:to => :translation}))
-
-    validates :title, :presence => true
-
-    validates :custom_slug, :uniqueness => true, :allow_blank => true
-
-    # Docs for acts_as_nested_set https://github.com/collectiveidea/awesome_nested_set
-    # rather than :delete_all we want :destroy
-    acts_as_nested_set counter_cache: :children_count, dependent: :destroy, touch: true
-
-    friendly_id :custom_slug_or_title, FriendlyIdOptions.options
-
-    has_many :parts, -> {
-      scope = order('position ASC')
-      scope = scope.includes(:translations) if ::Refinery::PagePart.respond_to?(:translation_class)
-      scope
-    },       :foreign_key => :refinery_page_id,
-             :class_name => '::Refinery::PagePart',
-             :inverse_of => :page,
-             :dependent => :destroy
-
-    accepts_nested_attributes_for :parts, :allow_destroy => true
+    validates :title, presence: true
+    validates :custom_slug, uniqueness: true, allow_blank: true
 
     before_destroy :deletable?
     after_save :reposition_parts!
@@ -103,7 +91,7 @@ module Refinery
       def find_by_path_or_id!(path, id)
         page = find_by_path_or_id(path, id)
 
-        raise ActiveRecord::RecordNotFound unless page
+        raise ::ActiveRecord::RecordNotFound unless page
 
         page
       end
@@ -129,7 +117,7 @@ module Refinery
       # 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.
       def in_menu
-        where(:show_in_menu => true).with_globalize
+        where(show_in_menu: true).with_mobility
       end
 
       # An optimised scope containing only live pages ordered for display in a menu.
@@ -138,8 +126,8 @@ module Refinery
       end
 
       # Wrap up the logic of finding the pages based on the translations table.
-      def with_globalize(conditions = {})
-        Pages::Finder.with_globalize(conditions)
+      def with_mobility(conditions = {})
+        Pages::Finder.with_mobility(conditions)
       end
 
       # Returns how many pages per page should there be when paginating pages
@@ -155,7 +143,7 @@ module Refinery
       protected
 
       def nullify_duplicate_slugs_under_the_same_parent!
-        t_slug = translation_class.arel_table[:slug]
+        t_slug = Translation.arel_table[:slug]
         joins(:translations).group(:locale, :parent_id, t_slug).having(t_slug.count.gt(1)).count.
         each do |(locale, parent_id, slug), count|
           by_slug(slug, :locale => locale).where(:parent_id => parent_id).drop(1).each do |page|
@@ -167,20 +155,20 @@ module Refinery
     end
 
     def translated_to_default_locale?
-      persisted? && translations.any?{ |t| t.locale == Refinery::I18n.default_frontend_locale}
+      persisted? && translations.any?{ |t| t.locale.to_sym == Refinery::I18n.default_frontend_locale}
     end
 
     # The canonical page for this particular page.
     # Consists of:
     #   * The current locale's translated slug
     def canonical
-      Globalize.with_locale(::Refinery::I18n.current_frontend_locale) { url }
+      Mobility.with_locale(::Refinery::I18n.current_frontend_locale) { url }
     end
 
     # The canonical slug for this particular page.
     # This is the slug for the current frontend locale.
     def canonical_slug
-      Globalize.with_locale(::Refinery::I18n.current_frontend_locale) { slug }
+      Mobility.with_locale(::Refinery::I18n.current_frontend_locale) { slug }
     end
 
     # Returns in cascading order: custom_slug or menu_title or title depending on
@@ -217,7 +205,7 @@ module Refinery
 
     # If you want to destroy a page that is set to be not deletable this is the way to do it.
     def destroy!
-      self.update_attributes(:menu_match => nil, :link_url => nil, :deletable => true)
+      self.update(:menu_match => nil, :link_url => nil, :deletable => true)
 
       self.destroy
     end
@@ -237,7 +225,7 @@ module Refinery
     end
 
     def nested_url
-      Globalize.with_locale(slug_locale) do
+      Mobility.with_locale(slug_locale) do
         if ::Refinery::Pages.scope_slug_by_parent && !root?
           self_and_ancestors.includes(:translations).map(&:to_param)
         else
@@ -379,9 +367,9 @@ module Refinery
     end
 
     def slug_locale
-      return Globalize.locale if translation_for(Globalize.locale, false).try(:slug).present?
+      return Mobility.locale if slug
 
-      if translations.empty? || translation_for(Refinery::I18n.default_frontend_locale, false).try(:slug).present?
+      if translations.empty? || slug(locale: Refinery::I18n.default_frontend_locale)
         Refinery::I18n.default_frontend_locale
       else
         translations.first.locale

data/app/models/refinery/page_part.rb

@@ -6,19 +6,25 @@ module Refinery
     before_validation :set_default_slug
 
     validates :title, :presence => true
-    validates :slug, :presence => true, :uniqueness => {:scope => :refinery_page_id}
-    alias_attribute :content, :body
+    validates :slug, :presence => true, :uniqueness => {:scope => :refinery_page_id, :case_sensitive => true}
 
+    extend Mobility
     translates :body
 
-    attribute :body
+    def content
+      body
+    end
+
+    def content=(value)
+      self.body = value
+    end
 
     def to_param
       "page_part_#{slug.downcase.gsub(/\W/, '_')}"
     end
 
     def body=(value)
-      write_attribute(:body, value)
+      super
 
       normalise_text_fields
     end
@@ -33,8 +39,8 @@ module Refinery
     protected
 
     def normalise_text_fields
-      if read_attribute(:body).present? && read_attribute(:body) !~ %r{^<}
-        write_attribute(:body, "<p>#{read_attribute(:body).gsub("\r\n\r\n", "</p><p>").gsub("\r\n", "<br/>")}</p>")
+      if body? && body !~ %r{^<}
+        self.body = "<p>#{body.gsub("\r\n\r\n", "</p><p>").gsub("\r\n", "<br/>")}</p>"
       end
     end
 

data/app/presenters/refinery/pages/menu_presenter.rb

@@ -89,7 +89,7 @@ module Refinery
         url = find_url_for(item)
 
         # Now use all possible vectors to try to find a valid match
-        [path, URI.decode(path)].include?(url) || path == "/#{item.original_id}"
+        [path, CGI.unescape(path)].include?(url) || path == "/#{item.original_id}"
       end
 
       def menu_item_css(menu_item, index)
@@ -136,4 +136,4 @@ module Refinery
       end
     end
   end
-end
+end

data/app/views/refinery/admin/pages/_form.html.erb

@@ -1,22 +1,22 @@
 <%= form_for [refinery, :admin, @page],
-             :url => (refinery.admin_update_page_path(@page.nested_url) if @page.persisted?) do |f| %>
+             url: (refinery.admin_update_page_path(@page.nested_url) if @page.persisted?) do |f| %>
 
-  <%= render '/refinery/admin/error_messages', :object => @page, :include_object_name => true %>
+  <%= render '/refinery/admin/error_messages', object: @page, include_object_name: true %>
 
-  <%= render '/refinery/admin/locale_picker', :current_locale => Globalize.locale %>
+  <%= render '/refinery/admin/locale_picker', current_locale: Mobility.locale %>
 
   <div class="field">
     <%= f.label :title %>
-    <%= f.text_field :title, :class => "larger widest" %>
+    <%= f.text_field :title, class: %w(larger widest) %>
   </div>
 
-  <%= render 'form_fields_after_title', :f => f %>
+  <%= render 'form_fields_after_title', f: f %>
 
-  <div class='field'>
-    <%= render 'form_page_parts', :f => f %>
+  <div class="field">
+    <%= render 'form_page_parts', f: f %>
   </div>
 
-  <%= render 'form_advanced_options', :f => f %>
+  <%= render 'form_advanced_options', f: f %>
 
   <%= render '/refinery/admin/form_actions', f: f,
              continue_editing: true,
@@ -33,7 +33,7 @@
              ),
              cancel_url: refinery.admin_pages_path %>
 
-  <%= render 'form_new_page_parts', :f => f if Refinery::Pages.new_page_parts %>
+  <%= render 'form_new_page_parts', f: f if Refinery::Pages.new_page_parts %>
 <% end %>
 
 <% content_for :javascripts do %>
@@ -64,7 +64,7 @@
             action: prev_url,
             target: prev_target
           });
-        }, 100);
+        }, 500);
       });
     });
   </script>

data/app/views/refinery/admin/pages/_page.html.erb

@@ -1,53 +1,25 @@
-<% # setup params for various action links
-  add_url =   refinery.new_admin_page_path(parent_id: page.id)
-  edit_url =  refinery.admin_edit_page_path(page.nested_url, switch_locale: (page.translations.first.locale unless page.translated_to_default_locale?))
-  delete_url = refinery.admin_delete_page_path(page.nested_url)
-  delete_options = {
-     class: "cancel confirm-delete",
-            data: {confirm: t('message',  scope: 'refinery.admin.delete', title: translated_field(page, :title))}
-          }
- %>
+<% edit_url = refinery.admin_edit_page_path(page.nested_url) %>
 
-  <li class='clearfix record items' id="<%= dom_id(page) -%>">
-  <div class='clearfix'>
-    <% if page.children.present? %>
-      <span class="item icon toggle <%= 'expanded' if Refinery::Pages.auto_expand_admin_tree %>"
-        title="<%= t('expand_collapse', scope: 'refinery.admin.pages')%>">
-      </span>
-    <% else %>
-      <span class="item"></span>
-    <% end %>
+<li class="record page <%= cycle('on', 'on-hover') %>" id="<%= dom_id(page) %>">
+  <div class="item">
+    <%= page_icon(page.children.size) %>
+    <%= link_to translated_field(page, :title), edit_url, class: [:title, :edit], title: t('.edit') %>
+    <%= page_meta_information(page) %>
+    <%= edit_in_locales(edit_url, locales_with_translated_field(page, 'title', include_current: false)) %>
 
-    <span class='title <%= 'toggle' if page.children.present? %>'>
-      <%= translated_field(page, :title) %>
-      <%= page_meta_information page %>
-    </span>
-
-    <% if Refinery::I18n.frontend_locales.many? %>
-      <span class='locales'>
-        <% page.translations.sort_by{ |t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
-          <% if translation.title.present? %>
-            <%= link_to refinery.admin_edit_page_path(page.nested_url, switch_locale: translation.locale),
-                        class: 'locale', title: translation.locale.upcase do %>
-
-              <div class="<%=translation.locale %> locale_marker">
-                <%= locale_text_icon(translation.locale.upcase) %>
-              </div>
-            <% end %>
-          <% end %>
-        <% end %>
-      </span>
-    <% end %>
-
-    <span class='actions'>
-      <%= action_icon(:preview, page.url,   t('.view_live_html')) %>
-      <%= action_icon(:add,     add_url,    t('new',    scope: 'refinery.admin.pages' ) ) %>
-      <%= action_icon(:edit,    edit_url ,  t('edit',   scope: 'refinery.admin.pages' ) ) %>
-      <%= action_icon(:delete,  delete_url, t('delete', scope: 'refinery.admin.pages' ), delete_options ) if page.deletable? %>
+    <span class="actions">
+      <%= action_icon(:preview, page.url, t('.view_live_html')) %>
+      <%= action_icon(:add, refinery.new_admin_page_path(parent_id: page.id), t('.new')) %>
+      <%= action_icon(:edit, edit_url, t('.edit')) %>
+      <%= action_icon(:delete, refinery.admin_delete_page_path(page.nested_url),
+                      t('.delete'),
+                      class: "cancel confirm-delete",
+                      data: { confirm: t('message', scope: 'refinery.admin.delete', title: translated_field(page, :title)) }
+          ) if page.deletable? %>
     </span>
   </div>
 
   <%= content_tag :ul, class: 'nested', data: { 'ajax-content': refinery.admin_children_pages_path(page.nested_url) } do %>
-    <%= render(partial: 'page', collection: page.children, cached: true) if Refinery::Pages.auto_expand_admin_tree %>
+    <%= render(partial: 'page', collection: page.children, cached: ->(child_page) { child_page.self_and_descendants.to_a }) if Refinery::Pages.auto_expand_admin_tree %>
   <% end %>
 </li>

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

@@ -1,5 +1,5 @@
 <%= content_tag :ul, id: 'sortable_list' do %>
-  <%= render partial: 'page', collection: @pages.roots, cached: true %>
+  <%= render partial: 'page', collection: @pages.roots, cached: ->(child_page) { child_page.self_and_descendants } %>
 <% end %>
 
 <%= render '/refinery/admin/sortable_list', continue_reordering: !!local_assigns[:continue_reordering] %>

data/app/views/refinery/admin/pages/children.html.erb

@@ -1 +1 @@
-<%= render partial: 'page', collection: @page.children, cached: true %>
+<%= render partial: 'page', collection: @page.children, cached: ->(child_page) { child_page.self_and_descendants } %>

data/app/views/refinery/admin/pages_dialogs/_page_link.html.erb

@@ -1,6 +1,6 @@
 <%
   link_args = defined?(link_to_arguments) ? link_to_arguments : {}
-  page_link_url = Globalize.with_locale(params[:switch_locale]) { refinery.url_for(page_link.url) }
+  page_link_url = Mobility.with_locale(params[:switch_locale]) { refinery.url_for(page_link.url) }
   # current_link is relative so check against the relative url portion before conditionally making it absolute
   linked = params[:current_link].present? && page_link_url == params[:current_link]
   page_link_url = "#{[request.protocol, request.host_with_port].join}#{page_link_url}" if Refinery::Pages.absolute_page_links