alchemy_cms 4.3.2 → 4.4.0

data/app/assets/stylesheets/alchemy/sitemap.scss

@@ -47,30 +47,6 @@
   text-overflow: ellipsis;
 }
 
-#page_selector_container {
-  height: 230px;
-  background-color: $light-gray;
-  margin-bottom: 4px;
-  border-width: $form-field-border-width;
-  border-style: $form-field-border-style;
-  border-color: $form-field-border-color;
-  overflow: auto;
-  padding: 4px 0 0 4px;
-  border-radius: $default-border-radius;
-
-  .sitemap_pagename_link:hover {
-    text-decoration: none;
-
-    &:after {
-      display: none;
-    }
-  }
-
-  .sitemap_right_tools {
-    width: 24px;
-  }
-}
-
 .sitemap_line_spacer {
   float: left;
   width: 20px;
@@ -177,11 +153,6 @@
   li {
     padding-left: 0;
 
-    .selected_page {
-      background-color: $linked-color;
-      color: $dark-gray;
-    }
-
     li {
       padding-left: $sitemap-line-height;
       padding-right: 0;
@@ -245,7 +216,3 @@
     .page_icon { cursor: default }
   }
 }
-
-.elements_from_page_selector {
-  width: 100%;
-}

data/app/assets/stylesheets/alchemy/tags.scss

@@ -71,9 +71,6 @@
     $margin: $default-margin/2 0,
     $padding: $default-padding 2*$default-padding $default-padding
   );
-  display: inline-block;
-  vertical-align: middle;
-  color: $text-color;
   pointer-events: none;
   font-size: $small-font-size;
 }

data/app/controllers/alchemy/admin/base_controller.rb

@@ -138,6 +138,7 @@ module Alchemy
           (params[:options] || ActionController::Parameters.new).permit!
         end
       end
+      deprecate :options_from_params, deprecator: Alchemy::Deprecation
 
       # This method decides if we want to raise an exception or not.
       #

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -8,16 +8,8 @@ module Alchemy
 
       def index
         @page = Page.find(params[:page_id])
-        @elements = @page.all_elements.not_nested.unfixed.not_trashed
-        @fixed_elements = @page.all_elements.fixed.not_trashed
-      end
-
-      def list
-        @page_id = params[:page_id]
-        if @page_id.blank? && !params[:page_urlname].blank?
-          @page_id = Language.current.pages.find_by(urlname: params[:page_urlname]).id
-        end
-        @elements = Element.published.where(page_id: @page_id)
+        @elements = @page.all_elements.not_nested.unfixed.not_trashed.includes(*element_includes)
+        @fixed_elements = @page.all_elements.fixed.not_trashed.includes(*element_includes)
       end
 
       def new
@@ -61,7 +53,7 @@ module Alchemy
       def update
         if @element.update_contents(contents_params)
           @page = @element.page
-          @element_validated = @element.update_attributes!(element_params)
+          @element_validated = @element.update(element_params)
         else
           @element_validated = false
           @notice = Alchemy.t('Validation failed')
@@ -104,6 +96,27 @@ module Alchemy
 
       private
 
+      def element_includes
+        [
+          {
+            contents: {
+              essence: :ingredient_association
+            }
+          },
+          :tags,
+          {
+            all_nested_elements: [
+              {
+                contents: {
+                  essence: :ingredient_association
+                }
+              },
+              :tags
+            ]
+          }
+        ]
+      end
+
       def load_element
         @element = Element.find(params[:id])
       end

data/app/controllers/alchemy/admin/languages_controller.rb

@@ -13,6 +13,11 @@ module Alchemy
           page_layout: Config.get(:default_language)['page_layout']
         )
       end
+
+      def switch
+        set_alchemy_language(params[:language_id])
+        do_redirect_to request.referer || alchemy.admin_dashboard_path
+      end
     end
   end
 end

data/app/controllers/alchemy/admin/nodes_controller.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    class NodesController < Admin::ResourcesController
+      def index
+        @root_nodes = Node.language_root_nodes
+      end
+
+      def new
+        @node = Node.new(
+          parent_id: params[:parent_id],
+          language: Language.current
+        )
+      end
+
+      def toggle
+        node = Node.find(params[:id])
+        node.update(folded: !node.folded)
+        if node.folded?
+          head :ok
+        else
+          render partial: 'node', collection: node.children.includes(:page, :children)
+        end
+      end
+
+      private
+
+      def resource_params
+        params.require(:node).permit(
+          :parent_id,
+          :language_id,
+          :page_id,
+          :name,
+          :url,
+          :title,
+          :nofollow,
+          :external
+        )
+      end
+    end
+  end
+end

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

@@ -26,7 +26,6 @@ module Alchemy
       def index
         authorize! :index, :alchemy_admin_pages
 
-        @languages = Language.on_current_site
         if !@page_root
           @language = Language.current
           @languages_with_page_tree = Language.on_current_site.with_root_page
@@ -104,7 +103,7 @@ module Alchemy
       def update
         # stores old page_layout value, because unfurtunally rails @page.changes does not work here.
         @old_page_layout = @page.page_layout
-        if @page.update_attributes(page_params)
+        if @page.update(page_params)
           @notice = Alchemy.t("Page saved", name: @page.name)
           @while_page_edit = request.referer.include?('edit')
 
@@ -140,12 +139,6 @@ module Alchemy
       end
 
       def link
-        if configuration(:show_real_root)
-          @page_root = Page.root
-        else
-          set_root_page
-        end
-        @content_id = params[:content_id]
         @attachments = Attachment.all.collect { |f|
           [f.name, download_attachment_path(id: f.id, name: f.urlname)]
         }
@@ -219,11 +212,6 @@ module Alchemy
         do_redirect_to admin_pages_path
       end
 
-      def switch_language
-        set_alchemy_language(params[:language_id])
-        do_redirect_to redirect_path_for_switch_language
-      end
-
       def flush
         Language.current.pages.flushables.update_all(published_at: Time.current)
         # We need to ensure, that also all layoutpages get the +published_at+ timestamp set,
@@ -341,14 +329,6 @@ module Alchemy
         end
       end
 
-      def redirect_path_for_switch_language
-        if request.referer && request.referer.include?('admin/layoutpages')
-          admin_layoutpages_path
-        else
-          admin_pages_path
-        end
-      end
-
       def redirect_path_after_create_page
         if @page.redirects_to_external? || !@page.editable_by?(current_alchemy_user)
           admin_pages_path

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -68,7 +68,7 @@ module Alchemy
       end
 
       def update
-        resource_instance_variable.update_attributes(resource_params)
+        resource_instance_variable.update(resource_params)
         render_errors_or_redirect(
           resource_instance_variable,
           resources_path(resource_instance_variable.class, search_filter_params),

data/app/controllers/alchemy/admin/tags_controller.rb

@@ -34,8 +34,7 @@ module Alchemy
           operation_text = Alchemy.t('Replaced Tag') % {old_tag: @tag.name, new_tag: @new_tag.name}
           @tag.destroy
         else
-          @tag.update_attributes(tag_params)
-          @tag.save
+          @tag.update(tag_params)
           operation_text = Alchemy.t(:successfully_updated_tag)
         end
         render_errors_or_redirect @tag, admin_tags_path, operation_text

data/app/controllers/alchemy/api/contents_controller.rb

@@ -16,6 +16,8 @@ module Alchemy
       if params[:element_id].present?
         @contents = @contents.where(element_id: params[:element_id])
       end
+      @contents = @contents.includes(*content_includes)
+
       render json: @contents, adapter: :json, root: 'contents'
     end
 
@@ -30,12 +32,25 @@ module Alchemy
     #
     def show
       if params[:id]
-        @content = Content.find(params[:id])
+        @content = Content.where(id: params[:id]).includes(:essence).first
       elsif params[:element_id] && params[:name]
-        @content = Content.find_by!(element_id: params[:element_id], name: params[:name])
+        @content = Content.where(
+          element_id: params[:element_id],
+          name: params[:name]
+        ).includes(*content_includes).first || raise(ActiveRecord::RecordNotFound)
       end
       authorize! :show, @content
       respond_with @content
     end
+
+    private
+
+    def content_includes
+      [
+        {
+          essence: :ingredient_association
+        }
+      ]
+    end
   end
 end

data/app/controllers/alchemy/api/elements_controller.rb

@@ -20,15 +20,40 @@ module Alchemy
       if params[:named].present?
         @elements = @elements.named(params[:named])
       end
+      @elements = @elements.includes(*element_includes)
+
       render json: @elements, adapter: :json, root: 'elements'
     end
 
     # Returns a json object for element
     #
     def show
-      @element = Element.find(params[:id])
+      @element = Element.where(id: params[:id]).includes(*element_includes).first
       authorize! :show, @element
       respond_with @element
     end
+
+    private
+
+    def element_includes
+      [
+        {
+          nested_elements: [
+            {
+              contents: {
+                essence: :ingredient_association
+              }
+            },
+            :tags
+          ]
+        },
+        {
+          contents: {
+            essence: :ingredient_association
+          }
+        },
+        :tags
+      ]
+    end
   end
 end

data/app/controllers/alchemy/api/pages_controller.rb

@@ -13,10 +13,24 @@ module Alchemy
       else
         @pages = Page.accessible_by(current_ability, :index)
       end
+      @pages = @pages.includes(*page_includes)
       if params[:page_layout].present?
+        Alchemy::Deprecation.warn <<~WARN
+          Passing page_layout parameter to Alchemy::Api::PagesController#index is deprecated.
+          Please pass a Ransack search query instead:
+              q: {
+                page_layout_eq: '#{params[:page_layout]}'
+              }
+        WARN
         @pages = @pages.where(page_layout: params[:page_layout])
       end
-      render json: @pages, adapter: :json, root: 'pages'
+      @pages = @pages.ransack(params[:q]).result
+
+      if params[:page]
+        @pages = @pages.page(params[:page]).per(params[:per_page])
+      end
+
+      render json: @pages, adapter: :json, root: 'pages', meta: meta_data
     end
 
     # Returns all pages as nested json object for tree views
@@ -47,12 +61,69 @@ module Alchemy
     private
 
     def load_page
-      @page = Page.find_by(id: params[:id]) ||
-              Language.current.pages.find_by(
-                urlname: params[:urlname],
-                language_code: params[:locale] || Language.current.code
-              ) ||
-              raise(ActiveRecord::RecordNotFound)
+      @page = load_page_by_id || load_page_by_urlname || raise(ActiveRecord::RecordNotFound)
+    end
+
+    def load_page_by_id
+      # The route param is called :urlname although it might be an integer
+      Page.where(id: params[:urlname]).includes(page_includes).first
+    end
+
+    def load_page_by_urlname
+      Language.current.pages.where(
+        urlname: params[:urlname],
+        language_code: params[:locale] || Language.current.code
+      ).includes(page_includes).first
+    end
+
+    def meta_data
+      {
+        total_count: total_count_value,
+        per_page: per_page_value,
+        page: page_value
+      }
+    end
+
+    def total_count_value
+      params[:page] ? @pages.total_count : @pages.size
+    end
+
+    def per_page_value
+      if params[:page]
+        (params[:per_page] || Kaminari.config.default_per_page).to_i
+      else
+        @pages.size
+      end
+    end
+
+    def page_value
+      params[:page] ? params[:page].to_i : nil
+    end
+
+    def page_includes
+      [
+        :tags,
+        {
+          elements: [
+            {
+              nested_elements: [
+                {
+                  contents: {
+                    essence: :ingredient_association
+                  }
+                },
+                :tags
+              ]
+            },
+            {
+              contents: {
+                essence: :ingredient_association
+              }
+            },
+            :tags
+          ]
+        }
+      ]
     end
   end
 end

data/app/controllers/alchemy/messages_controller.rb

@@ -19,7 +19,7 @@ module Alchemy
   #     - name: mail_from
   #       type: EssenceText
   #     - name: success_page
-  #       type: EssenceSelect
+  #       type: EssencePage
   #
   # The fields +mail_to+, +mail_from+, +subject+ and +success_page+ are recommended.
   # The +Alchemy::MessagesController+ uses them to send your mails. So your customer has full controll of these values inside his contactform element.
@@ -32,14 +32,16 @@ module Alchemy
   #     elements: [pageheading, heading, contactform]
   #     autogenerate: [contactform]
   #
-  # Disabling the page caching is stronlgy recommended!
+  # Disabling the page caching is strongly recommended!
   #
   # The editor view for your element should have this layout:
   #
-  #   <%= render_essence_editor_by_name(element, 'mail_from') %>
-  #   <%= render_essence_editor_by_name(element, 'mail_to') %>
-  #   <%= render_essence_editor_by_name(element, 'subject') %>
-  #   <%= page_selector(element, 'success_page', page_attribute: :urlname) %>
+  #   <%= element_editor_for(element) do |el| %>
+  #     <%= el.edit :mail_from %>
+  #     <%= el.edit :mail_to %>
+  #     <%= el.edit :subject %>
+  #     <%= el.edit :success_page %>
+  #   <% end %>
   #
   # Please have a look at the +alchemy/config/config.yml+ file for further Message settings.
   #
@@ -97,8 +99,8 @@ module Alchemy
 
     def redirect_to_success_page
       flash[:notice] = Alchemy.t(:success, scope: 'contactform.messages')
-      if @element.ingredient(:success_page)
-        urlname = @element.ingredient(:success_page)
+      if success_page
+        urlname = success_page_urlname
       elsif mailer_config['forward_to_page'] && mailer_config['mail_success_page']
         urlname = Page.find_by(urlname: mailer_config['mail_success_page']).urlname
       else
@@ -110,6 +112,19 @@ module Alchemy
       )
     end
 
+    def success_page
+      @_success_page ||= @element.ingredient(:success_page)
+    end
+
+    def success_page_urlname
+      case success_page
+      when Alchemy::Page
+        success_page.urlname
+      when String
+        success_page
+      end
+    end
+
     def get_page
       @page = Language.current.pages.find_by(page_layout: mailer_config['page_layout_name'])
       if @page.blank?