alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -45,7 +45,6 @@ module Alchemy
       def model_class
         "alchemy/#{params[:remarkable_type]}".classify.constantize
       end
-
     end
   end
 end

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

@@ -8,7 +8,6 @@ module Alchemy
       def new
         @element = Element.find(params[:element_id])
         @options = options_from_params
-        @contents = @element.available_contents
         @content = @element.contents.build
       end
 
@@ -38,13 +37,13 @@ module Alchemy
             Content.where(id: id).update_all(position: idx + 1)
           end
         end
-        @notice = _t("Successfully saved content position")
+        @notice = Alchemy.t("Successfully saved content position")
       end
 
       def destroy
         @content = Content.find(params[:id])
         @content_dom_id = @content.dom_id
-        @notice = _t("Successfully deleted content", content: @content.name_for_label)
+        @notice = Alchemy.t("Successfully deleted content", content: @content.name_for_label)
         @content.destroy
       end
 
@@ -71,7 +70,6 @@ module Alchemy
           html_options: @html_options.symbolize_keys
         }
       end
-
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Alchemy
 
       def index
         @last_edited_pages = Page.from_current_site.all_last_edited_from(current_alchemy_user)
-        @locked_pages = Page.from_current_site.all_locked
+        @all_locked_pages = Page.from_current_site.locked
         if Alchemy.user_class.respond_to?(:logged_in)
           @online_users = Alchemy.user_class.logged_in.to_a - [current_alchemy_user]
         end
@@ -26,12 +26,12 @@ module Alchemy
       def update_check
         @alchemy_version = Alchemy.version
         if @alchemy_version < latest_alchemy_version
-          render :text => 'true'
+          render text: 'true'
         else
-          render :text => 'false'
+          render text: 'false'
         end
       rescue UpdateServiceUnavailable => e
-        render :text => e, :status => 503
+        render text: e, status: 503
       end
 
       private

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

@@ -1,7 +1,7 @@
 module Alchemy
   module Admin
     class ElementsController < Alchemy::Admin::BaseController
-      before_action :load_element, only: [:update, :trash, :fold]
+      before_action :load_element, only: [:update, :trash, :fold, :publish]
       authorize_resource class: Alchemy::Element
 
       def index
@@ -23,9 +23,10 @@ module Alchemy
       end
 
       def new
-        @page = Page.find_by_id(params[:page_id])
+        @page = Page.find(params[:page_id])
+        @parent_element = Element.find_by(id: params[:parent_element_id])
+        @elements = @page.available_element_definitions(@parent_element.try(:name))
         @element = @page.elements.build
-        @elements = @page.available_element_definitions
         @clipboard = get_clipboard('elements')
         @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
       end
@@ -72,11 +73,15 @@ module Alchemy
           @element_validated = @element.update_attributes!(element_params)
         else
           @element_validated = false
-          @notice = _t('Validation failed')
-          @error_message = "<h2>#{@notice}</h2><p>#{_t(:content_validations_headline)}</p>".html_safe
+          @notice = Alchemy.t('Validation failed')
+          @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:content_validations_headline)}</p>".html_safe
         end
       end
 
+      def publish
+        @element.update(public: !@element.public?)
+      end
+
       # Trashes the Element instead of deleting it.
       def trash
         @page = @element.page
@@ -86,12 +91,13 @@ module Alchemy
       def order
         @trashed_element_ids = Element.trashed.where(id: params[:element_ids]).pluck(:id)
         Element.transaction do
-          params[:element_ids].each_with_index do |element_id, idx|
-            # Ensure to set page_id and cell_id to the current page and
+          params.fetch(:element_ids, []).each_with_index do |element_id, idx|
+            # Ensure to set page_id, cell_id and parent_element_id to the current page and
             # cell because of trashed elements could still have old values
             Element.where(id: element_id).update_all(
               page_id: params[:page_id],
               cell_id: params[:cell_id],
+              parent_element_id: params[:parent_element_id],
               position: idx + 1
             )
           end
@@ -137,9 +143,9 @@ module Alchemy
 
       def paste_element_from_clipboard
         @source_element = Element.find(element_from_clipboard['id'])
-        new_attributes = {:page_id => @page.id}
+        new_attributes = {page_id: @page.id}
         if @page.can_have_cells?
-          new_attributes = new_attributes.merge({:cell_id => find_or_create_cell.try(:id)})
+          new_attributes = new_attributes.merge({cell_id: find_or_create_cell.try(:id)})
         end
         element = Element.copy(@source_element, new_attributes)
         if element_from_clipboard['action'] == 'cut'
@@ -159,9 +165,12 @@ module Alchemy
       end
 
       def element_params
-        params.require(:element).permit(:public, :tag_list)
+        if @element.taggable?
+          params.fetch(:element, {}).permit(:tag_list)
+        else
+          params.fetch(:element, {})
+        end
       end
-
     end
   end
 end

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

@@ -30,13 +30,13 @@ module Alchemy
         # but the cache needs to be get invalid.
         # And we don't user @content.touch here, because that updates
         # also the element and page timestamps what we don't want yet.
-        @content.update_column(:updated_at, Time.now)
+        @content.update_column(:updated_at, Time.current)
       end
 
       private
 
       def essence_file_params
-        params.require(:essence_file).permit(:title, :css_class)
+        params.require(:essence_file).permit(:title, :css_class, :link_text)
       end
 
       def load_essence_file

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

@@ -17,7 +17,7 @@ module Alchemy
       def crop
         if @picture = @essence_picture.picture
           @content = @essence_picture.content
-          @options[:format] ||= (configuration(:image_store_format) or 'png')
+          @options[:format] ||= (configuration(:image_store_format) || 'png')
 
           @min_size = sizes_from_essence_or_params
           @ratio = ratio_from_size_or_params
@@ -26,7 +26,7 @@ module Alchemy
           @default_box = @essence_picture.default_mask(@min_size)
           @initial_box = @essence_picture.cropping_mask || @default_box
         else
-          @no_image_notice = _t(:no_image_for_cropper_found)
+          @no_image_notice = Alchemy.t(:no_image_for_cropper_found)
         end
       end
 
@@ -49,7 +49,7 @@ module Alchemy
         # but the cache needs to be get invalid.
         # And we don't user @content.touch here, because that updates
         # also the element and page timestamps what we don't want yet.
-        @content.update_column(:updated_at, Time.now)
+        @content.update_column(:updated_at, Time.current)
       end
 
       def destroy
@@ -91,7 +91,7 @@ module Alchemy
       # aspect ratio, don't specify a size or only width or height.
       #
       def ratio_from_size_or_params
-        if @min_size.has_value?(0) && @options[:fixed_ratio]
+        if @min_size.value?(0) && @options[:fixed_ratio]
           @options[:fixed_ratio].to_f
         elsif !@min_size[:width].zero? && !@min_size[:height].zero?
           @min_size[:width].to_f / @min_size[:height].to_f
@@ -100,21 +100,22 @@ module Alchemy
         end
       end
 
-      # Infers the minimum width or height if the aspect ratio and one dimension
-      # is specified.
+      # Infers the minimum width or height
+      # if the aspect ratio and one dimension is specified.
       #
       def infer_width_or_height_from_ratio
+        return unless @ratio
+
         if @min_size[:height].zero?
-          @min_size[:height] = (@min_size[:width] / @ratio).to_i if @ratio
+          @min_size[:height] = (@min_size[:width] / @ratio).to_i
         else
-          @min_size[:width] = (@min_size[:height] * @ratio).to_i if @ratio
+          @min_size[:width] = (@min_size[:height] * @ratio).to_i
         end
       end
 
       def essence_picture_params
         params.require(:essence_picture).permit(:alt_tag, :caption, :css_class, :render_size, :title, :crop_from, :crop_size)
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Alchemy
   module Admin
     class LanguagesController < ResourcesController
-
       def new
         @language = Language.new
         @language.page_layout = configured_page_layout || @language.page_layout

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

@@ -4,7 +4,6 @@ module Alchemy
       authorize_resource class: :alchemy_admin_layoutpages
 
       def index
-        @locked_pages = Page.from_current_site.all_locked_by(current_alchemy_user)
         @layout_root = Page.find_or_create_layout_root_for(Language.current.id)
         @languages = Language.all
       end
@@ -13,7 +12,6 @@ module Alchemy
         @page = Page.find(params[:id])
         @page_layouts = PageLayout.layouts_with_own_for_select(@page.page_layout, Language.current.id, true)
       end
-
     end
   end
 end

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

@@ -34,6 +34,5 @@ module Alchemy
     def legacy_page_url_params
       params.require(:legacy_page_url).permit(:urlname)
     end
-
   end
 end

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

@@ -1,23 +1,29 @@
 module Alchemy
   module Admin
     class PagesController < Alchemy::Admin::BaseController
+      include OnPageLayout::CallbacksRunner
+
       helper 'alchemy/pages'
 
       before_action :set_translation,
         except: [:show]
 
       before_action :load_page,
-        only: [:show, :info, :unlock, :visit, :publish, :configure, :edit, :update, :destroy, :fold]
+        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
+      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
 
-        @locked_pages = Page.from_current_site.all_locked_by(current_alchemy_user)
         @languages = Language.all
         if !@page_root
           @language = Language.current
@@ -25,13 +31,23 @@ module Alchemy
         end
       end
 
+      # Returns all pages as a tree from the root given by the id parameter
+      #
+      def tree
+        authorize! :tree, :alchemy_admin_pages
+
+        render json: PageTreeSerializer.new(@page, ability: current_ability,
+                                            user: current_alchemy_user,
+                                            full: params[:full] == 'true')
+      end
+
       # Used by page preview iframe in Page#edit view.
       #
       def show
         @preview_mode = true
         Page.current_preview = @page
         # Setting the locale to pages language, so the page content has it's correct translations.
-        ::I18n.locale = @page.language_code
+        ::I18n.locale = @page.language.locale
         render layout: 'application'
       end
 
@@ -49,7 +65,7 @@ module Alchemy
       def create
         @page = paste_from_clipboard || Page.new(page_params)
         if @page.save
-          flash[:notice] = _t("Page created", name: @page.name)
+          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?)
@@ -63,11 +79,10 @@ module Alchemy
       def edit
         # fetching page via before filter
         if page_is_locked?
-          flash[:notice] = _t('This page is locked', name: @page.locker_name)
+          flash[:notice] = Alchemy.t('This page is locked', name: @page.locker_name)
           redirect_to admin_pages_path
         else
           @page.lock_to!(current_alchemy_user)
-          @locked_pages = Page.from_current_site.all_locked_by(current_alchemy_user)
         end
         @layoutpage = @page.layoutpage?
       end
@@ -86,7 +101,7 @@ module Alchemy
         # 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)
-          @notice = _t("Page saved", :name => @page.name)
+          @notice = Alchemy.t("Page saved", name: @page.name)
           @while_page_edit = request.referer.include?('edit')
         else
           configure
@@ -100,7 +115,7 @@ module Alchemy
         @layoutpage = @page.layoutpage?
         if @page.destroy
           set_root_page
-          @message = _t("Page deleted", :name => name)
+          @message = Alchemy.t("Page deleted", name: name)
           flash[:notice] = @message
           respond_to do |format|
             format.js
@@ -112,21 +127,16 @@ module Alchemy
       end
 
       def link
-        @url_prefix = ""
         if configuration(:show_real_root)
           @page_root = Page.root
         else
           set_root_page
         end
-        @area_name = params[:area_name]
         @content_id = params[:content_id]
-        @attachments = Attachment.all.collect { |f| [f.name, download_attachment_path(:id => f.id, :name => f.urlname)] }
-        if params[:link_urls_for] == "newsletter"
-          @url_prefix = current_server
-        end
-        if multi_language?
-          @url_prefix = "#{Language.current.code}/"
-        end
+        @attachments = Attachment.all.collect { |f|
+          [f.name, download_attachment_path(id: f.id, name: f.urlname)]
+        }
+        @url_prefix = prefix_locale? ? "#{Language.current.code}/" : ""
       end
 
       def fold
@@ -141,8 +151,8 @@ module Alchemy
       def unlock
         # fetching page via before filter
         @page.unlock!
-        flash[:notice] = _t(:unlocked_page, :name => @page.name)
-        @pages_locked_by_user = Page.from_current_site.all_locked_by(current_alchemy_user)
+        flash[:notice] = Alchemy.t(:unlocked_page, name: @page.name)
+        @pages_locked_by_user = Page.from_current_site.locked_by(current_alchemy_user)
         respond_to do |format|
           format.js
           format.html {
@@ -153,7 +163,10 @@ module Alchemy
 
       def visit
         @page.unlock!
-        redirect_to show_page_path(urlname: @page.urlname, locale: multi_language? ? @page.language_code : nil)
+        redirect_to show_page_path(
+          urlname: @page.urlname,
+          locale: prefix_locale? ? @page.language_code : nil
+        )
       end
 
       # Sets the page public and updates the published_at attribute that is used as cache_key
@@ -161,13 +174,13 @@ module Alchemy
       def publish
         # fetching page via before filter
         @page.publish!
-        flash[:notice] = _t(:page_published, :name => @page.name)
+        flash[:notice] = Alchemy.t(:page_published, name: @page.name)
         redirect_back_or_to_default(admin_pages_path)
       end
 
       def copy_language_tree
         language_root_to_copy_from.copy_children_to(copy_of_language_root)
-        flash[:notice] = _t(:language_pages_copied)
+        flash[:notice] = Alchemy.t(:language_pages_copied)
         redirect_to admin_pages_path
       end
 
@@ -188,7 +201,7 @@ module Alchemy
           end
         end
 
-        flash[:notice] = _t("Pages order saved")
+        flash[:notice] = Alchemy.t("Pages order saved")
         do_redirect_to admin_pages_path
       end
 
@@ -202,7 +215,6 @@ module Alchemy
         # 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.
-        # Not the greatest solution, but ¯\_(ツ)_/¯
         Language.current.pages.flushable_layoutpages.update_all(published_at: Time.current)
         respond_to { |format| format.js }
       end
@@ -307,7 +319,12 @@ module Alchemy
       end
 
       def pages_from_raw_request
-        request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
+        request.raw_post.split('&').map do |i|
+          parts = i.split('=')
+          {
+            parts[0].gsub(/[^0-9]/, '') => parts[1]
+          }
+        end
       end
 
       def redirect_path_for_switch_language
@@ -339,8 +356,9 @@ module Alchemy
       end
 
       def page_is_locked?
-        return if !@page.locker.try(:logged_in?)
-        @page.locked? && @page.locker != current_alchemy_user
+        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 paste_from_clipboard
@@ -354,7 +372,6 @@ module Alchemy
       def set_root_page
         @page_root = Language.current_root_page
       end
-
     end
   end
 end