alchemy_cms 4.0.5 → 4.1.0.beta

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

@@ -8,15 +8,15 @@ module Alchemy
       helper 'alchemy/admin/tags'
 
       def index
-        @query = Attachment.ransack(params[:q])
+        @query = Attachment.ransack(search_filter_params[:q])
         @attachments = @query.result
 
-        if params[:tagged_with].present?
-          @attachments = @attachments.tagged_with(params[:tagged_with])
+        if search_filter_params[:tagged_with].present?
+          @attachments = @attachments.tagged_with(search_filter_params[:tagged_with])
         end
 
-        if params[:file_type].present?
-          @attachments = @attachments.with_file_type(params[:file_type])
+        if search_filter_params[:file_type].present?
+          @attachments = @attachments.with_file_type(search_filter_params[:file_type])
         end
 
         @attachments = @attachments
@@ -69,7 +69,7 @@ module Alchemy
       private
 
       def search_filter_params
-        params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
+        @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
           *common_search_filter_includes + [
             :file_type,
             :content_id

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

@@ -39,20 +39,20 @@ module Alchemy
       end
 
       # Handles exceptions
-      def exception_handler(e)
-        exception_logger(e)
-        show_error_notice(e)
+      def exception_handler(error)
+        exception_logger(error)
+        show_error_notice(error)
         if defined?(Airbrake)
-          notify_airbrake(e) unless Rails.env.development? || Rails.env.test?
+          notify_airbrake(error) unless Rails.env.development? || Rails.env.test?
         end
       end
 
       # Displays an error notice in the Alchemy backend.
-      def show_error_notice(e)
-        @error = e
+      def show_error_notice(error)
+        @error = error
         # truncate the message, because very long error messages (i.e from mysql2) causes cookie overflow errors
-        @notice = e.message[0..255]
-        @trace = e.backtrace[0..50]
+        @notice = error.message[0..255]
+        @trace = error.backtrace[0..50]
         if request.xhr?
           render action: "error_notice"
         else
@@ -112,7 +112,7 @@ module Alchemy
       def per_page_value_for_screen_size
         return 25 if session[:screen_size].blank?
         screen_height = session[:screen_size].split('x').last.to_i
-        (screen_height / 30) - 10
+        (screen_height / 50) - 12
       end
 
       # Does redirects for html and js requests

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

@@ -7,11 +7,6 @@ module Alchemy
 
       authorize_resource class: Alchemy::Content
 
-      def new
-        @element = Element.find(params[:element_id])
-        @content = @element.contents.build
-      end
-
       def create
         @element = Element.find(params[:content][:element_id])
         @content = Content.create_from_scratch(@element, content_params)
@@ -26,11 +21,6 @@ module Alchemy
         end
       end
 
-      def update
-        @content = Content.find(params[:id])
-        @content.update_essence(content_params)
-      end
-
       def order
         Content.transaction do
           params[:content_ids].each_with_index do |id, idx|
@@ -40,13 +30,6 @@ module Alchemy
         @notice = Alchemy.t("Successfully saved content position")
       end
 
-      def destroy
-        @content = Content.find(params[:id])
-        @content_dom_id = @content.dom_id
-        @notice = Alchemy.t("Successfully deleted content", content: @content.name_for_label)
-        @content.destroy
-      end
-
       private
 
       def content_params

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

@@ -147,10 +147,7 @@ module Alchemy
 
       def paste_element_from_clipboard
         @source_element = Element.find(element_from_clipboard['id'])
-        new_attributes = {
-          parent_element_id: create_element_params[:parent_element_id],
-          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)})
         end

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

@@ -28,9 +28,7 @@ module Alchemy
 
         # We need to update timestamp here because we don't save yet,
         # 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.current)
+        @content.touch
       end
 
       private

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

@@ -47,9 +47,7 @@ module Alchemy
 
         # We need to update timestamp here because we don't save yet,
         # 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.current)
+        @content.touch
       end
 
       def destroy

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

@@ -4,7 +4,7 @@ module Alchemy
   module Admin
     class LanguagesController < ResourcesController
       def index
-        @query = Language.on_current_site.ransack(params[:q])
+        @query = Language.on_current_site.ransack(search_filter_params[:q])
         @languages = @query.result.page(params[:page] || 1).per(per_page_value_for_screen_size)
       end
 

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

@@ -14,8 +14,8 @@ module Alchemy
 
       def index
         @size = params[:size].present? ? params[:size] : 'medium'
-        @query = Picture.ransack(params[:q])
-        @pictures = Picture.search_by(params, @query, pictures_per_page_for_size(@size))
+        @query = Picture.ransack(search_filter_params[:q])
+        @pictures = Picture.search_by(search_filter_params, @query, pictures_per_page_for_size(@size))
 
         if in_overlay?
           archive_overlay
@@ -92,7 +92,7 @@ module Alchemy
         else
           flash[:warn] = Alchemy.t("Could not delete Pictures")
         end
-      rescue => e
+      rescue StandardError => e
         flash[:error] = e.message
       ensure
         redirect_to_index
@@ -102,7 +102,7 @@ module Alchemy
         name = @picture.name
         @picture.destroy
         flash[:notice] = Alchemy.t("Picture deleted successfully", name: name)
-      rescue => e
+      rescue StandardError => e
         flash[:error] = e.message
       ensure
         redirect_to_index
@@ -141,7 +141,7 @@ module Alchemy
       end
 
       def search_filter_params
-        params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:picture_ids]).permit(
+        @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:picture_ids]).permit(
           *common_search_filter_includes + [
             :size,
             :element_id,

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

@@ -7,7 +7,7 @@ require 'alchemy/resources_helper'
 module Alchemy
   module Admin
     class ResourcesController < Alchemy::Admin::BaseController
-      COMMON_SEARCH_FILTER_EXCLUDES = [:id, :utf8, :_method, :_].freeze
+      COMMON_SEARCH_FILTER_EXCLUDES = [:id, :utf8, :_method, :_, :format].freeze
 
       include Alchemy::ResourcesHelper
 
@@ -20,18 +20,18 @@ module Alchemy
       before_action :authorize_resource
 
       def index
-        @query = resource_handler.model.ransack(params[:q])
+        @query = resource_handler.model.ransack(search_filter_params[:q])
         items = @query.result
 
         if contains_relations?
           items = items.includes(*resource_relations_names)
         end
 
-        if params[:tagged_with].present?
-          items = items.tagged_with(params[:tagged_with])
+        if search_filter_params[:tagged_with].present?
+          items = items.tagged_with(search_filter_params[:tagged_with])
         end
 
-        if params[:filter].present?
+        if search_filter_params[:filter].present?
           items = items.public_send(sanitized_filter_params)
         end
 
@@ -61,7 +61,7 @@ module Alchemy
         resource_instance_variable.save
         render_errors_or_redirect(
           resource_instance_variable,
-          resources_path(resource_handler.namespaced_resources_name, current_location_params),
+          resources_path(resource_instance_variable.class, search_filter_params),
           flash_notice_for_resource_action
         )
       end
@@ -70,7 +70,7 @@ module Alchemy
         resource_instance_variable.update_attributes(resource_params)
         render_errors_or_redirect(
           resource_instance_variable,
-          resources_path(resource_handler.namespaced_resources_name, current_location_params),
+          resources_path(resource_instance_variable.class, search_filter_params),
           flash_notice_for_resource_action
         )
       end
@@ -78,7 +78,7 @@ module Alchemy
       def destroy
         resource_instance_variable.destroy
         flash_notice_for_resource_action
-        do_redirect_to resource_url_proxy.url_for(current_location_params.merge(action: 'index'))
+        do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: 'index'))
       end
 
       def resource_handler
@@ -132,12 +132,12 @@ module Alchemy
 
       def sanitized_filter_params
         resource_model.alchemy_resource_filters.detect do |filter|
-          filter == params[:filter]
+          filter == search_filter_params[:filter]
         end || :all
       end
 
       def search_filter_params
-        params.except(*COMMON_SEARCH_FILTER_EXCLUDES).permit(*common_search_filter_includes)
+        @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES).permit(*common_search_filter_includes).to_h
       end
 
       def common_search_filter_includes

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

@@ -6,7 +6,7 @@ module Alchemy
       before_action :load_tag, only: [:edit, :update, :destroy]
 
       def index
-        @query = ActsAsTaggableOn::Tag.ransack(params[:q])
+        @query = Gutentag::Tag.ransack(search_filter_params[:q])
         @tags = @query
                   .result
                   .page(params[:page] || 1)
@@ -15,21 +15,21 @@ module Alchemy
       end
 
       def new
-        @tag = ActsAsTaggableOn::Tag.new
+        @tag = Gutentag::Tag.new
       end
 
       def create
-        @tag = ActsAsTaggableOn::Tag.create(tag_params)
+        @tag = Gutentag::Tag.create(tag_params)
         render_errors_or_redirect @tag, admin_tags_path, Alchemy.t('New Tag Created')
       end
 
       def edit
-        @tags = ActsAsTaggableOn::Tag.order("name ASC").to_a - [@tag]
+        @tags = Gutentag::Tag.order("name ASC").to_a - [@tag]
       end
 
       def update
         if tag_params[:merge_to]
-          @new_tag = ActsAsTaggableOn::Tag.find(tag_params[:merge_to])
+          @new_tag = Gutentag::Tag.find(tag_params[:merge_to])
           Tag.replace(@tag, @new_tag)
           operation_text = Alchemy.t('Replaced Tag') % {old_tag: @tag.name, new_tag: @new_tag.name}
           @tag.destroy
@@ -57,7 +57,7 @@ module Alchemy
       private
 
       def load_tag
-        @tag = ActsAsTaggableOn::Tag.find(params[:id])
+        @tag = Gutentag::Tag.find(params[:id])
       end
 
       def tag_params
@@ -66,7 +66,7 @@ module Alchemy
 
       def tags_from_term(term)
         return [] if term.blank?
-        ActsAsTaggableOn::Tag.where(['LOWER(name) LIKE ?', "#{term.downcase}%"])
+        Gutentag::Tag.where(['LOWER(name) LIKE ?', "#{term.downcase}%"])
       end
 
       def json_for_autocomplete(items, attribute)

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

@@ -7,7 +7,12 @@ module Alchemy
     # You can either load all or only these for :element_id param
     #
     def index
-      @contents = Content.accessible_by(current_ability, :index)
+      # Fix for cancancan not able to merge multiple AR scopes for logged in users
+      if can? :manage, Alchemy::Content
+        @contents = Content.all
+      else
+        @contents = Content.accessible_by(current_ability, :index)
+      end
       if params[:element_id].present?
         @contents = @contents.where(element_id: params[:element_id])
       end

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

@@ -9,7 +9,11 @@ module Alchemy
     # If you want to only load a specific type of element pass ?named=an_element_name
     #
     def index
-      @elements = Element.accessible_by(current_ability, :index)
+      @elements = Element.not_nested
+      # Fix for cancancan not able to merge multiple AR scopes for logged in users
+      if cannot? :manage, Alchemy::Element
+        @elements = @elements.accessible_by(current_ability, :index)
+      end
       if params[:page_id].present?
         @elements = @elements.where(page_id: params[:page_id])
       end

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

@@ -7,7 +7,12 @@ module Alchemy
     # Returns all pages as json object
     #
     def index
-      @pages = Page.accessible_by(current_ability, :index)
+      # Fix for cancancan not able to merge multiple AR scopes for logged in users
+      if can? :edit_content, Alchemy::Page
+        @pages = Page.all
+      else
+        @pages = Page.accessible_by(current_ability, :index)
+      end
       if params[:page_layout].present?
         @pages = @pages.where(page_layout: params[:page_layout])
       end

data/app/controllers/alchemy/base_controller.rb

@@ -95,9 +95,11 @@ module Alchemy
     end
 
     # Logs the current exception to the error log.
-    def exception_logger(e)
-      Rails.logger.error("\n#{e.class} #{e.message} in #{e.backtrace.first}")
-      Rails.logger.error(e.backtrace[1..50].each { |l| l.gsub(/#{Rails.root.to_s}/, '') }.join("\n"))
+    def exception_logger(error)
+      Rails.logger.error("\n#{error.class} #{error.message} in #{error.backtrace.first}")
+      Rails.logger.error(error.backtrace[1..50].each { |line|
+        line.gsub(/#{Rails.root.to_s}/, '')
+      }.join("\n"))
     end
   end
 end

data/app/controllers/alchemy/pages_controller.rb

@@ -156,7 +156,7 @@ module Alchemy
 
     def set_expiration_headers
       if @page.cache_page?
-        expires_in @page.expiration_time, public: !@page.restricted, must_revalidate: true
+        expires_in @page.expiration_time, public: !@page.restricted
       else
         expires_now
       end

data/app/helpers/alchemy/admin/base_helper.rb

@@ -105,7 +105,7 @@ module Alchemy
         content_tag(:div, class: 'js_filter_field_box') do
           concat text_field_tag(nil, nil, options)
           concat render_icon(:search)
-          concat link_to('', '', class: 'js_filter_field_clear', title: Alchemy.t(:click_to_show_all))
+          concat link_to(render_icon(:times, size: 'xs'), '', class: 'js_filter_field_clear', title: Alchemy.t(:click_to_show_all))
           concat content_tag(:label, Alchemy.t(:search), for: options[:id])
         end
       end
@@ -191,7 +191,7 @@ module Alchemy
         options = {
           title: Alchemy.t('Delete'),
           message: Alchemy.t('Are you sure?'),
-          icon: 'destroy'
+          icon: :minus
         }.merge(options)
         button_with_confirm(
           render_icon(options[:icon]),
@@ -227,7 +227,7 @@ module Alchemy
       # == Example
       #
       #   <%= toolbar_button(
-      #     icon: 'create',
+      #     icon: :plus,
       #     label: 'Create',
       #     url: new_resource_path,
       #     title: 'Create Resource',
@@ -267,7 +267,7 @@ module Alchemy
           active: false,
           link_options: {},
           dialog_options: {},
-          loading_indicator: true
+          loading_indicator: false
         }.merge(options.symbolize_keys)
         button = render(
           'alchemy/admin/partials/toolbar_button',
@@ -288,7 +288,7 @@ module Alchemy
       #   <% toolbar(
       #     buttons: [
       #       {
-      #         icon: 'create',
+      #         icon: :plus,
       #         label: label_title,
       #         url: new_resource_path,
       #         title: label_title,
@@ -374,7 +374,7 @@ module Alchemy
         type = html_options.delete(:type) || 'date'
         date = html_options.delete(:value) || object.send(method.to_sym).presence
         date = Time.zone.parse(date) if date.is_a?(String)
-        value = date ? l(date, format: "#{type}picker".to_sym) : nil
+        value = date ? l(date, format: "alchemy.#{type}picker".to_sym) : nil
 
         text_field object.class.name.demodulize.underscore.to_sym,
           method.to_sym, {type: "text", class: type, "data-datepicker-type" => type, value: value}.merge(html_options)
@@ -385,7 +385,7 @@ module Alchemy
       def render_hint_for(element)
         return unless element.has_hint?
         content_tag :span, class: 'hint-with-icon' do
-          render_icon(:questionmark) +
+          render_icon('question-circle') +
             content_tag(:span, element.hint.html_safe, class: 'hint-bubble')
         end
       end
@@ -421,15 +421,15 @@ module Alchemy
       #
       # == Example
       #
-      #   <%= hint_with_tooltip('Page layout is missing', class: 'warning icon') %>
+      #   <%= hint_with_tooltip('Page layout is missing', icon: 'info') %>
       #
       # @param text [String] - The text displayed in the tooltip
-      # @param html_options [Hash] - Options passed to the wrapper `content_tag`
+      # @param icon: 'exclamation-triangle' [String] - Icon name
       #
-      def hint_with_tooltip(text, html_options = {})
-        css_class = "#{html_options[:class]} with-hint"
-        content_tag :span, html_options.merge(class: css_class) do
-          content_tag(:span, text, class: 'hint-bubble')
+      # @return [String]
+      def hint_with_tooltip(text, icon: 'exclamation-triangle')
+        content_tag :span, class: 'hint-with-icon' do
+          render_icon(icon) + content_tag(:span, text, class: 'hint-bubble')
         end
       end
 
@@ -437,8 +437,7 @@ module Alchemy
       # that explains the user that the page layout is missing
       def page_layout_missing_warning
         hint_with_tooltip(
-          Alchemy.t(:page_definition_missing),
-          class: 'inline warning icon'
+          Alchemy.t(:page_definition_missing)
         )
       end