alchemy_cms 4.6.0 → 5.0.0.rc2

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

@@ -3,15 +3,16 @@
 module Alchemy
   module Admin
     class NodesController < Admin::ResourcesController
+      include Alchemy::Admin::CurrentLanguage
+
       def index
         @root_nodes = Node.language_root_nodes
       end
 
       def new
         @node = Node.new(
-          site: Alchemy::Site.current,
           parent_id: params[:parent_id],
-          language: Language.current
+          language: @current_language,
         )
       end
 
@@ -19,7 +20,7 @@ module Alchemy
 
       def resource_params
         params.require(:node).permit(
-          :site_id,
+          :menu_type,
           :parent_id,
           :language_id,
           :page_id,
@@ -27,7 +28,7 @@ module Alchemy
           :url,
           :title,
           :nofollow,
-          :external
+          :external,
         )
       end
     end

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

@@ -5,29 +5,31 @@ module Alchemy
     class PagesController < Alchemy::Admin::BaseController
       include OnPageLayout::CallbacksRunner
 
-      helper 'alchemy/pages'
+      helper "alchemy/pages"
+
+      before_action :load_page, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
+
+      authorize_resource class: Alchemy::Page, except: [:index, :tree]
+
+      before_action only: [:index, :tree, :flush, :new, :order, :create, :copy_language_tree] do
+        authorize! :index, :alchemy_admin_pages
+      end
+
+      include Alchemy::Admin::CurrentLanguage
 
       before_action :set_translation,
         except: [:show]
 
-      before_action :load_page,
-        only: [:show, :info, :unlock, :visit, :publish, :configure, :edit, :update, :destroy, :fold,
-               :tree]
-
       before_action :set_root_page,
         only: [:index, :show, :sort, :order]
 
-      authorize_resource class: Alchemy::Page, except: [:index, :tree]
-
       before_action :run_on_page_layout_callbacks,
         if: :run_on_page_layout_callbacks?,
         only: [:show]
 
       def index
-        authorize! :index, :alchemy_admin_pages
-
         if !@page_root
-          @language = Language.current
+          @language = @current_language
           @languages_with_page_tree = Language.on_current_site.with_root_page
           @page_layouts = PageLayout.layouts_for_select(@language.id)
         end
@@ -36,8 +38,6 @@ module Alchemy
       # Returns all pages as a tree from the root given by the id parameter
       #
       def tree
-        authorize! :tree, :alchemy_admin_pages
-
         render json: serialized_page_tree
       end
 
@@ -48,7 +48,7 @@ module Alchemy
         Page.current_preview = @page
         # Setting the locale to pages language, so the page content has it's correct translations.
         ::I18n.locale = @page.language.locale
-        render(layout: Alchemy::Config.get(:admin_page_preview_layout) || 'application')
+        render(layout: Alchemy::Config.get(:admin_page_preview_layout) || "application")
       end
 
       def info
@@ -56,10 +56,10 @@ module Alchemy
       end
 
       def new
-        @page = Page.new(layoutpage: params[:layoutpage] == 'true', parent_id: params[:parent_id])
-        @page_layouts = PageLayout.layouts_for_select(Language.current.id, @page.layoutpage?)
-        @clipboard = get_clipboard('pages')
-        @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, Language.current.id, @page.layoutpage?)
+        @page ||= Page.new(layoutpage: params[:layoutpage] == "true", parent_id: params[:parent_id])
+        @page_layouts = PageLayout.layouts_for_select(@current_language.id, @page.layoutpage?)
+        @clipboard = get_clipboard("pages")
+        @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, @current_language.id, @page.layoutpage?)
       end
 
       def create
@@ -68,9 +68,7 @@ module Alchemy
           flash[:notice] = Alchemy.t("Page created", name: @page.name)
           do_redirect_to(redirect_path_after_create_page)
         else
-          @page_layouts = PageLayout.layouts_for_select(Language.current.id, @page.layoutpage?)
-          @clipboard = get_clipboard('pages')
-          @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, Language.current.id, @page.layoutpage?)
+          new
           render :new
         end
       end
@@ -82,18 +80,18 @@ module Alchemy
       def edit
         # fetching page via before filter
         if page_is_locked?
-          flash[:warning] = Alchemy.t('This page is locked', name: @page.locker_name)
+          flash[:warning] = Alchemy.t("This page is locked", name: @page.locker_name)
           redirect_to admin_pages_path
         elsif page_needs_lock?
           @page.lock_to!(current_alchemy_user)
         end
+        @preview_url = Alchemy::Admin::PREVIEW_URL.url_for(@page)
         @layoutpage = @page.layoutpage?
       end
 
       # Set page configuration like page names, meta tags and states.
       def configure
-        @page_layouts = PageLayout.layouts_with_own_for_select(@page.page_layout, Language.current.id, @page.layoutpage?)
-        render @page.definition['redirects_to_external'] ? 'configure_external' : 'configure'
+        @page_layouts = PageLayout.layouts_with_own_for_select(@page.page_layout, @current_language.id, @page.layoutpage?)
       end
 
       # Updates page
@@ -105,7 +103,7 @@ module Alchemy
         @old_page_layout = @page.page_layout
         if @page.update(page_params)
           @notice = Alchemy.t("Page saved", name: @page.name)
-          @while_page_edit = request.referer.include?('edit')
+          @while_page_edit = request.referer.include?("edit")
 
           unless @while_page_edit
             @tree = serialized_page_tree
@@ -121,17 +119,17 @@ module Alchemy
           flash[:notice] = Alchemy.t("Page deleted", name: @page.name)
 
           # Remove page from clipboard
-          clipboard = get_clipboard('pages')
-          clipboard.delete_if { |item| item['id'] == @page.id.to_s }
+          clipboard = get_clipboard("pages")
+          clipboard.delete_if { |item| item["id"] == @page.id.to_s }
         end
 
         respond_to do |format|
           format.js do
             @redirect_url = if @page.layoutpage?
-                              alchemy.admin_layoutpages_path
-                            else
-                              alchemy.admin_pages_path
-                            end
+                alchemy.admin_layoutpages_path
+              else
+                alchemy.admin_pages_path
+              end
 
             render :redirect
           end
@@ -171,7 +169,7 @@ module Alchemy
         redirect_to show_page_url(
           urlname: @page.urlname,
           locale: prefix_locale? ? @page.language_code : nil,
-          host: @page.site.host == "*" ? request.host : @page.site.host
+          host: @page.site.host == "*" ? request.host : @page.site.host,
         )
       end
 
@@ -212,24 +210,22 @@ module Alchemy
       end
 
       def flush
-        Language.current.pages.flushables.update_all(published_at: Time.current)
+        @current_language.pages.flushables.update_all(published_at: Time.current)
         # We need to ensure, that also all layoutpages get the +published_at+ timestamp set,
         # but not set to public true, because the cache_key for an element is +published_at+
         # and we don't want the layout pages to be present in +Page.published+ scope.
-        Language.current.pages.flushable_layoutpages.update_all(published_at: Time.current)
+        @current_language.pages.flushable_layoutpages.update_all(published_at: Time.current)
         respond_to { |format| format.js }
       end
 
       private
 
       def copy_of_language_root
-        page_copy = Page.copy(
+        Page.copy(
           language_root_to_copy_from,
           language_id: params[:languages][:new_lang_id],
-          language_code: Language.current.code
+          language_code: @current_language.code,
         )
-        page_copy.move_to_child_of Page.root
-        page_copy
       end
 
       def language_root_to_copy_from
@@ -259,14 +255,14 @@ module Alchemy
       def visit_nodes(nodes, my_left, parent, depth, tree, url, restricted)
         nodes.each do |item|
           my_right = my_left + 1
-          my_restricted = item['restricted'] || restricted
+          my_restricted = item["restricted"] || restricted
           urls = process_url(url, item)
 
-          if item['children']
-            my_right, tree = visit_nodes(item['children'], my_left + 1, item['id'], depth + 1, tree, urls[:children_path], my_restricted)
+          if item["children"]
+            my_right, tree = visit_nodes(item["children"], my_left + 1, item["id"], depth + 1, tree, urls[:children_path], my_restricted)
           end
 
-          tree[item['id']] = TreeNode.new(my_left, my_right, parent, depth, urls[:my_urlname], my_restricted)
+          tree[item["id"]] = TreeNode.new(my_left, my_right, parent, depth, urls[:my_urlname], my_restricted)
           my_left = my_right + 1
         end
 
@@ -295,24 +291,14 @@ module Alchemy
       # This function will add a node's own slug into their ancestor's path
       # in order to create the full URL of a node
       #
-      # NOTE: external and invisible pages are not part of the full path of their children
-      #
       # @param [String]
       #   The node's ancestors path
       # @param [Hash]
       #   A children node
       #
       def process_url(ancestors_path, item)
-        default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item['slug'].to_s
-
-        pair = {my_urlname: default_urlname, children_path: default_urlname}
-
-        if item['external'] == true || item['visible'] == false
-          # children ignore an ancestor in their path if external or invisible
-          pair[:children_path] = ancestors_path
-        end
-
-        pair
+        default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item["slug"].to_s
+        { my_urlname: default_urlname, children_path: default_urlname }
       end
 
       def load_page
@@ -320,19 +306,19 @@ module Alchemy
       end
 
       def pages_from_raw_request
-        request.raw_post.split('&').map do |i|
-          parts = i.split('=')
+        request.raw_post.split("&").map do |i|
+          parts = i.split("=")
           {
-            parts[0].gsub(/[^0-9]/, '') => parts[1]
+            parts[0].gsub(/[^0-9]/, "") => parts[1],
           }
         end
       end
 
       def redirect_path_after_create_page
-        if @page.definition['redirects_to_external'] || !@page.editable_by?(current_alchemy_user)
-          admin_pages_path
-        else
+        if @page.editable_by?(current_alchemy_user)
           params[:redirect_to] || edit_admin_page_path(@page)
+        else
+          admin_pages_path
         end
       end
 
@@ -351,30 +337,32 @@ module Alchemy
       def page_is_locked?
         return false if !@page.locker.try(:logged_in?)
         return false if !current_alchemy_user.respond_to?(:id)
+
         @page.locked? && @page.locker.id != current_alchemy_user.id
       end
 
       def page_needs_lock?
         return true unless @page.locker
+
         @page.locker.try!(:id) != current_alchemy_user.try!(:id)
       end
 
       def paste_from_clipboard
         if params[:paste_from_clipboard]
           source = Page.find(params[:paste_from_clipboard])
-          parent = Page.find_by(id: params[:page][:parent_id]) || Page.root
+          parent = Page.find_by(id: params[:page][:parent_id])
           Page.copy_and_paste(source, parent, params[:page][:name])
         end
       end
 
       def set_root_page
-        @page_root = Language.current_root_page
+        @page_root = @current_language.root_page
       end
 
       def serialized_page_tree
         PageTreeSerializer.new(@page, ability: current_ability,
                                       user: current_alchemy_user,
-                                      full: params[:full] == 'true')
+                                      full: params[:full] == "true")
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Alchemy
       include UploaderResponses
       include ArchiveOverlay
 
-      helper 'alchemy/admin/tags'
+      helper "alchemy/admin/tags"
 
       before_action :load_resource,
         only: [:show, :edit, :update, :destroy, :info]
@@ -14,12 +14,12 @@ module Alchemy
       authorize_resource class: Alchemy::Picture
 
       def index
-        @size = params[:size].present? ? params[:size] : 'medium'
+        @size = params[:size].present? ? params[:size] : "medium"
         @query = Picture.ransack(search_filter_params[:q])
         @pictures = Picture.search_by(
           search_filter_params,
           @query,
-          items_per_page
+          items_per_page,
         )
 
         if in_overlay?
@@ -31,7 +31,7 @@ module Alchemy
         @previous = @picture.previous(params)
         @next = @picture.next(params)
         @assignments = @picture.essence_pictures.joins(content: {element: :page})
-        render action: 'show'
+        render action: "show"
       end
 
       def create
@@ -46,19 +46,19 @@ module Alchemy
 
       def edit_multiple
         @pictures = Picture.where(id: params[:picture_ids])
-        @tags = @pictures.collect(&:tag_list).flatten.uniq.join(', ')
+        @tags = @pictures.collect(&:tag_list).flatten.uniq.join(", ")
       end
 
       def update
         if @picture.update(picture_params)
           @message = {
             body: Alchemy.t(:picture_updated_successfully, name: @picture.name),
-            type: 'notice'
+            type: "notice",
           }
         else
           @message = {
             body: Alchemy.t(:picture_update_failed),
-            type: 'error'
+            type: "error",
           }
         end
         render :update
@@ -89,7 +89,7 @@ module Alchemy
           if not_deletable.any?
             flash[:warn] = Alchemy.t(
               "These pictures could not be deleted, because they were in use",
-              names: not_deletable.to_sentence
+              names: not_deletable.to_sentence,
             )
           else
             flash[:notice] = Alchemy.t("Pictures deleted successfully", names: names.to_sentence)
@@ -116,15 +116,15 @@ module Alchemy
       def items_per_page
         if in_overlay?
           case params[:size]
-          when 'small' then 25
-          when 'large' then 4
+          when "small" then 25
+          when "large" then 4
           else
             9
           end
         else
           cookies[:alchemy_pictures_per_page] = params[:per_page] ||
-                                                cookies[:alchemy_pictures_per_page] ||
-                                                pictures_per_page_for_size(params[:size])
+            cookies[:alchemy_pictures_per_page] ||
+            pictures_per_page_for_size(params[:size])
         end
       end
 
@@ -137,8 +137,8 @@ module Alchemy
 
       def pictures_per_page_for_size(size)
         case size
-        when 'small' then 60
-        when 'large' then 12
+        when "small" then 60
+        when "large" then 12
         else
           20
         end
@@ -154,8 +154,8 @@ module Alchemy
             :size,
             :element_id,
             :swap,
-            :content_id
-          ]
+            :content_id,
+          ],
         )
       end
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'csv'
-require 'alchemy/resource'
-require 'alchemy/resources_helper'
+require "csv"
+require "alchemy/resource"
+require "alchemy/resources_helper"
 
 module Alchemy
   module Admin
@@ -22,6 +22,7 @@ module Alchemy
 
       def index
         @query = resource_handler.model.ransack(search_filter_params[:q])
+        @query.sorts = default_sort_order if @query.sorts.empty?
         items = @query.result
 
         if contains_relations?
@@ -52,7 +53,7 @@ module Alchemy
       end
 
       def show
-        render action: 'edit'
+        render action: "edit"
       end
 
       def edit; end
@@ -63,7 +64,7 @@ module Alchemy
         render_errors_or_redirect(
           resource_instance_variable,
           resources_path(resource_instance_variable.class, search_filter_params),
-          flash_notice_for_resource_action
+          flash_notice_for_resource_action,
         )
       end
 
@@ -72,14 +73,17 @@ module Alchemy
         render_errors_or_redirect(
           resource_instance_variable,
           resources_path(resource_instance_variable.class, search_filter_params),
-          flash_notice_for_resource_action
+          flash_notice_for_resource_action,
         )
       end
 
       def destroy
         resource_instance_variable.destroy
+        if resource_instance_variable.errors.any?
+          flash[:error] = resource_instance_variable.errors.full_messages.join(", ")
+        end
         flash_notice_for_resource_action
-        do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: 'index'))
+        do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: "index"))
       end
 
       def resource_handler
@@ -92,6 +96,7 @@ module Alchemy
       # The key should look like "Modelname successfully created|updated|destroyed."
       def flash_notice_for_resource_action(action = params[:action])
         return if resource_instance_variable.errors.any?
+
         case action.to_sym
         when :create
           verb = "created"
@@ -104,11 +109,11 @@ module Alchemy
       end
 
       def is_alchemy_module?
-        !alchemy_module.nil? && !alchemy_module['engine_name'].nil?
+        !alchemy_module.nil? && !alchemy_module["engine_name"].nil?
       end
 
       def alchemy_module
-        @alchemy_module ||= module_definition_for(controller: params[:controller], action: 'index')
+        @alchemy_module ||= module_definition_for(controller: params[:controller], action: "index")
       end
 
       def load_resource
@@ -143,16 +148,14 @@ module Alchemy
 
       def common_search_filter_includes
         [
-          # contrary to Rails' documentation passing an empty hash to permit all keys does not work
-          {options: options_from_params.keys},
           {q: [
             resource_handler.search_field_name,
-            :s
+            :s,
           ]},
           :tagged_with,
           :filter,
           :page,
-          :per_page
+          :per_page,
         ].freeze
       end
 
@@ -164,6 +167,11 @@ module Alchemy
         per_page = Alchemy::Config.get(:items_per_page)
         [per_page, per_page * 2, per_page * 4]
       end
+
+      def default_sort_order
+        name = resource_handler.attributes.detect { |attr| attr[:name] == "name" }
+        name ? "name asc" : "#{resource_handler.attributes.first[:name]} asc"
+      end
     end
   end
 end