alchemy_cms 2.6.3 → 2.7.0

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

@@ -12,14 +12,7 @@ module Alchemy
         @size = params[:size].present? ? params[:size] : 'medium'
         @pictures = Picture.scoped
         @pictures = @pictures.tagged_with(params[:tagged_with]) if params[:tagged_with].present?
-        case params[:filter]
-          when 'recent'
-            @pictures = @pictures.recent
-          when 'last_upload'
-            @pictures = @pictures.last_upload
-          when 'without_tag'
-            @pictures = @pictures.where("cached_tag_list IS NULL OR cached_tag_list = ''")
-        end
+        @pictures = @pictures.filtered_by(params[:filter]) if params[:filter]
         @pictures = @pictures.find_paginated(params, pictures_per_page_for_size(@size))
         if in_overlay?
           archive_overlay
@@ -36,7 +29,7 @@ module Alchemy
           @while_assigning = true
           @content = Content.find_by_id(params[:content_id], :select => 'id')
           @element = Element.find(params[:element_id], :select => 'id')
-          @options = hashified_options
+          @options = options_from_params
           @page = params[:page]
           @per_page = params[:per_page]
         end
@@ -55,7 +48,7 @@ module Alchemy
           @while_assigning = true
           @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
           @element = Element.find(params[:element_id], :select => 'id')
-          @options = hashified_options
+          @options = options_from_params
           @page = params[:page] || 1
           @per_page = pictures_per_page_for_size(@size)
         end
@@ -123,7 +116,7 @@ module Alchemy
             end
           end
           if not_deletable.any?
-            flash[:warn] = _t("These pictures could not be deleted, because they where in use", :names => not_deletable.to_sentence)
+            flash[:warn] = _t("These pictures could not be deleted, because they were in use", :names => not_deletable.to_sentence)
           else
             flash[:notice] = _t("Pictures deleted successfully", :names => names.to_sentence)
           end
@@ -180,7 +173,7 @@ module Alchemy
       def archive_overlay
         @content = Content.find_by_id(params[:content_id], :select => 'id')
         @element = Element.find_by_id(params[:element_id], :select => 'id')
-        @options = hashified_options
+        @options = options_from_params
         respond_to do |format|
           format.html {
             render :partial => 'archive_overlay'

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

@@ -1,9 +1,11 @@
 require 'csv'
+require 'alchemy/resource'
+require 'alchemy/resources_helper'
+require 'handles_sortable_columns'
 
 module Alchemy
   module Admin
     class ResourcesController < Alchemy::Admin::BaseController
-
       include Alchemy::ResourcesHelper
       helper Alchemy::ResourcesHelper
       helper_method :resource_handler

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

@@ -7,7 +7,7 @@ module Alchemy
       def index
         @elements = Element.trashed
         @page = Page.find(params[:page_id])
-        @allowed_elements = Element.all_for_page(@page)
+        @allowed_elements = @page.available_element_definitions
         @draggable_trash_items = {}
         @elements.each { |e| @draggable_trash_items["element_#{e.id}"] = e.belonging_cellnames(@page) }
         render layout: !request.xhr?

data/app/controllers/alchemy/attachments_controller.rb

@@ -28,7 +28,7 @@ module Alchemy
   private
 
     def load_attachment
-      @attachment = Attachment.where(:id => params[:id]).first
+      @attachment = Attachment.find(params[:id])
     end
 
   end

data/app/controllers/alchemy/base_controller.rb

@@ -1,7 +1,6 @@
-# This is the main Alchemy controller all other controllers inheret from.
+# This is the main Alchemy controller all other controllers inherit from.
 module Alchemy
   class BaseController < ApplicationController
-
     include Alchemy::Modules
 
     protect_from_forgery
@@ -139,15 +138,6 @@ module Alchemy
       ActionMailer::Base.default_url_options[:host] = request.host_with_port
     end
 
-    def hashified_options
-      return nil if params[:options].blank?
-      if params[:options].is_a?(String)
-        Rack::Utils.parse_query(params[:options])
-      else
-        params[:options]
-      end
-    end
-
     # Returns the layout to be used by the current page. This method is being
     # used in PageController#show's invocation of #render.
     #
@@ -204,14 +194,12 @@ module Alchemy
 
     def permission_denied
       if current_user
-        if permitted_to? :index_alchemy_admin_dashboard
+        if permitted_to? :index, :alchemy_admin_dashboard
           if request.referer == alchemy.login_url
             render :file => Rails.root.join('public/422'), :status => 422
           elsif request.xhr?
             respond_to do |format|
-              format.js {
-                render :js => "Alchemy.growl('#{_t('You are not authorized')}', 'warning'); Alchemy.Buttons.enable();"
-              }
+              format.js { render status: 403 }
               format.html {
                 render :partial => 'alchemy/admin/partials/flash', :locals => {:message => _t('You are not authorized'), :flash_type => 'warning'}
               }

data/app/controllers/alchemy/messages_controller.rb

@@ -42,7 +42,7 @@ module Alchemy
   # Please have a look at the +alchemy/config/config.yml+ file for further Message settings.
   #
   class MessagesController < Alchemy::BaseController
-    include Alchemy::FerretSearch
+    include Alchemy::Ferret::Search
 
     before_filter :get_page, :except => :create
 
@@ -81,21 +81,15 @@ module Alchemy
     end
 
     def mail_to
-      @element.ingredient("mail_to")
-    rescue
-      mailer_config['mail_to']
+      @element.ingredient(:mail_to) || mailer_config['mail_to']
     end
 
     def mail_from
-      @element.ingredient("mail_from")
-    rescue
-      mailer_config['mail_from']
+      @element.ingredient(:mail_from) || mailer_config['mail_from']
     end
 
     def subject
-      @element.ingredient("subject")
-    rescue
-      mailer_config['subject']
+      @element.ingredient(:subject) || mailer_config['subject']
     end
 
     def redirect_to_success_page

data/app/controllers/alchemy/pages_controller.rb

@@ -1,17 +1,17 @@
 module Alchemy
   class PagesController < Alchemy::BaseController
-    include Alchemy::FerretSearch
+    include Ferret::Search
 
     # We need to include this helper because we need the breadcrumb method.
     # And we cannot define the breadcrump method as helper_method, because rspec does not see helper_methods.
     # Not the best solution, but's working.
     # Anyone with a better idea please provide a patch.
-    include Alchemy::BaseHelper
+    include BaseHelper
 
     rescue_from ActionController::RoutingError, :with => :render_404
 
     before_filter :enforce_primary_host_for_site
-    before_filter :render_page_or_redirect, :only => [:show, :sitemap]
+    before_filter :render_page_or_redirect, :only => [:show]
     before_filter :perform_search, :only => :show, :if => proc { configuration(:ferret) }
 
     filter_access_to :show, :attribute_check => true, :model => Alchemy::Page, :load_method => :load_page
@@ -49,11 +49,11 @@ module Alchemy
       end
     end
 
-    # Renders a Google conform sitemap in xml
+    # Renders a search engine compatible xml sitemap.
     def sitemap
-      @pages = Page.find_all_by_sitemap_and_public(true, true)
+      @pages = Page.sitemap
       respond_to do |format|
-        format.xml { render :layout => "sitemap" }
+        format.xml { render layout: 'alchemy/sitemap' }
       end
     end
 

data/app/controllers/alchemy/passwords_controller.rb

@@ -1,6 +1,6 @@
 module Alchemy
   class PasswordsController < Devise::PasswordsController
-    include Alchemy::FerretSearch
+    include Ferret::Search
     helper 'Alchemy::Admin::Base', 'Alchemy::Pages'
 
     before_filter { enforce_ssl if ssl_required? && !request.ssl? }

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -1,7 +1,7 @@
 module Alchemy
   class UserSessionsController < Devise::SessionsController
     # Necessary because this controller is also used for general login.
-    include Alchemy::FerretSearch
+    include Ferret::Search
     helper 'Alchemy::Admin::Base', 'Alchemy::Pages'
 
     before_filter(except: 'destroy') { enforce_ssl if ssl_required? && !request.ssl? }

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

@@ -12,6 +12,7 @@ module Alchemy
     #
     module BaseHelper
       include Alchemy::BaseHelper
+      include Alchemy::Admin::NavigationHelper
 
       # This helper renders the link to an overlay window.
       #
@@ -61,27 +62,6 @@ module Alchemy
         )
       end
 
-      # (internal) Used for rendering the folder link in +Admin::Pages#index+ sitemap.
-      def sitemapFolderLink(page)
-        return '' if page.level == 1
-        if page.folded?(current_user.id)
-          css_class = 'folded'
-          title = _t('Show childpages')
-        else
-          css_class = 'collapsed'
-          title = _t('Hide childpages')
-        end
-        link_to(
-          '',
-          alchemy.fold_admin_page_path(page),
-          :remote => true,
-          :method => :post,
-          :class => "page_folder #{css_class}",
-          :title => title,
-          :id => "fold_button_#{page.id}"
-        )
-      end
-
       # Used for language selector in Alchemy cockpit sitemap. So the user can select the language branche of the page.
       def language_codes_for_select
         configuration(:languages).collect { |language|
@@ -202,175 +182,6 @@ module Alchemy
         end
       end
 
-      # Returns an Array build for passing it to the options_for_select helper inside an essence editor partial.
-      #
-      # Useful for the <tt>select_values</tt> options from the {Alchemy::Admin::EssencesHelper#render_essence_editor} helpers.
-      #
-      # @option options [String or Page] :from_page (nil)
-      #   Return only elements from this page. You can either pass a Page instance, or a page_layout name
-      # @option options [Array or String] :elements_with_name (nil)
-      #   Return only elements with this name(s).
-      # @option options [String] :prompt (_t('Please choose'))
-      #   Prompt inside the select tag.
-      #
-      def elements_for_essence_editor_select(options={})
-        defaults = {
-          :from_page => nil,
-          :elements_with_name => nil,
-          :prompt => _t('Please choose')
-        }
-        options = defaults.merge(options)
-        if options[:from_page]
-          page = options[:from_page].is_a?(String) ? Page.find_by_page_layout(options[:from_page]) : options[:from_page]
-        end
-        if page
-          elements = options[:elements_with_name].blank? ? page.elements.published : page.elements.published.where(:name => options[:elements_with_name])
-        else
-          elements = options[:elements_with_name].blank? ? Element.published : Element.published.where(:name => options[:elements_with_name])
-        end
-        select_options = [[options[:prompt], ""]]
-        elements.each do |e|
-          select_options << [e.display_name_with_preview_text, e.id.to_s]
-        end
-        select_options
-      end
-
-      # Returns all public pages from current language as an option tags string suitable or the Rails +select_tag+ helper.
-      #
-      # @param [Array]
-      #   A collection of pages so it only returns these pages and does not query the database.
-      # @param [String]
-      #   Pass a +Page#name+ or +Page#id+ as selected item to the +options_for_select+ helper.
-      # @param [String]
-      #   Used as prompt message in the select tag
-      # @param [Symbol]
-      #   Method that is called on the page object to get the value that is passed with the params of the form.
-      #
-      def pages_for_select(pages = nil, selected = nil, prompt = "", page_attribute = :id)
-        result = [[prompt.blank? ? _t('Choose page') : prompt, ""]]
-        if pages.blank?
-          pages = Page.with_language(session[:language_id]).published.order(:lft)
-          pages.each do |p|
-            result << [("&nbsp;&nbsp;" * (p.level - 1) + p.name).html_safe, p.send(page_attribute).to_s]
-          end
-        else
-          pages.each do |p|
-            result << [p.name, p.send(page_attribute).to_s]
-          end
-        end
-        options_for_select(result, selected.to_s)
-      end
-
-      def render_essence_selection_editor(element, content, select_options)
-        if content.class == String
-          content = element.contents.find_by_name(content)
-        else
-          content = element.contents[content - 1]
-        end
-        if content.essence.nil?
-          return warning('Element', _t(:content_essence_not_found))
-        end
-        select_options = options_for_select(select_options, content.essence.content)
-        select_tag(
-          "contents[content_#{content.id}]",
-          select_options,
-          :class => 'alchemy_selectbox'
-        )
-      end
-
-      # Renders the admin main navigation
-      def admin_main_navigation
-        entries = ""
-        alchemy_modules.each do |alchemy_module|
-          entries << alchemy_main_navigation_entry(alchemy_module)
-        end
-        entries.html_safe
-      end
-
-      # Renders one admin main navigation entry
-      #
-      # @param [Hash] alchemy_module
-      #   The Hash representing a Alchemy module
-      #
-      def alchemy_main_navigation_entry(alchemy_module)
-        render 'alchemy/admin/partials/main_navigation_entry', :alchemy_module => alchemy_module.stringify_keys, :navigation => alchemy_module['navigation'].stringify_keys
-      end
-
-      # Renders the subnavigation in the admin areas
-      def admin_subnavigation
-        alchemy_module = module_definition_for(:controller => params[:controller], :action => 'index')
-        unless alchemy_module.nil?
-          entries = alchemy_module["navigation"].stringify_keys['sub_navigation']
-          render_admin_subnavigation(entries) unless entries.nil?
-        else
-          ""
-        end
-      end
-
-      # Renders the Subnavigation for the admin interface.
-      def render_admin_subnavigation(entries)
-        render "alchemy/admin/partials/sub_navigation_tab", :entries => entries
-      end
-
-      # Used for checking the main navi permissions
-      def navigate_module(navigation)
-        [navigation["action"].to_sym, navigation["controller"].gsub(/^\//, '').gsub(/\//, '_').to_sym]
-      end
-
-      # Returns true if the current controller and action is in a modules navigation definition.
-      def admin_mainnavi_active?(mainnav)
-        mainnav.stringify_keys!
-        subnavi = mainnav["sub_navigation"].map(&:stringify_keys) if mainnav["sub_navigation"]
-        nested = mainnav["nested"].map(&:stringify_keys) if mainnav["nested"]
-        if subnavi
-          (!subnavi.detect { |subnav| subnav["controller"].gsub(/^\//, '') == params[:controller] && subnav["action"] == params[:action] }.blank?) ||
-            (nested && !nested.detect { |n| n["controller"] == params[:controller] && n["action"] == params[:action] }.blank?)
-        else
-          mainnav["controller"] == params[:controller] && mainnav["action"] == params["action"]
-        end
-      end
-
-      # Returns true if the subnavigation entry is in the current params
-      def admin_sub_navigation_entry_active?(entry)
-        params[:controller] == entry["controller"].gsub(/^\//, '') && (params[:action] == entry["action"] || entry["nested_actions"] && entry["nested_actions"].include?(params[:action]))
-      end
-
-      # Calls the url_for helper on either an alchemy module engine, or the app alchemy is mounted at.
-      def url_for_module(alchemy_module)
-        navigation = alchemy_module['navigation'].stringify_keys
-        url_options = {
-          :controller => navigation['controller'],
-          :action => navigation['action']
-        }
-        if alchemy_module['engine_name']
-          eval(alchemy_module['engine_name']).url_for(url_options)
-        else
-          # hack to prefix any controller-path with / so it doesn't refer to alchemy/...
-          url_options[:controller] = url_options[:controller].gsub(/^([^\/])/, "/#{$1}")
-          main_app.url_for(url_options)
-        end
-      end
-
-      # Calls the url_for helper on either an alchemy module engine, or the app alchemy is mounted at.
-      def url_for_module_sub_navigation(navigation)
-        alchemy_module = module_definition_for(navigation)
-        engine_name = alchemy_module['engine_name'] if alchemy_module
-        navigation.stringify_keys!
-        url_options = {
-          :controller => navigation['controller'],
-          :action => navigation['action']
-        }
-        if engine_name
-          eval(engine_name).url_for(url_options)
-        else
-          main_app.url_for(url_options)
-        end
-      end
-
-      def main_navigation_css_classes(navigation)
-        ['main_navi_entry', admin_mainnavi_active?(navigation) ? 'active' : nil].compact.join(" ")
-      end
-
       # (internal) Renders translated Module Names for html title element.
       def render_alchemy_title
         if content_for?(:title)
@@ -414,6 +225,21 @@ module Alchemy
 
       # Renders a toolbar button for the Alchemy toolbar
       #
+      # == Example
+      #
+      #   <%= toolbar_button(
+      #     icon: 'create',
+      #     label: 'Create',
+      #     url: new_resource_path,
+      #     title: 'Create Resource',
+      #     hotkey: 'alt-n',
+      #     overlay_options: {
+      #       title: 'Create Resource',
+      #       size: "430x400"
+      #     },
+      #     if_permitted_to: [:new, resource_permission_scope]
+      #   ) %>
+      #
       # @option options [String] :icon
       #   Icon class. See +app/assets/stylesheets/alchemy/icons.css.sccs+ for available icons, or make your own.
       # @option options [String] :label
@@ -436,47 +262,22 @@ module Alchemy
       #   Shows the please wait overlay while loading. Only for buttons not opening an overlay window.
       #
       def toolbar_button(options = {})
-        options.symbolize_keys!
-        defaults = {
-          :overlay => true,
-          :skip_permission_check => false,
-          :active => false,
-          :link_options => {},
-          :overlay_options => {},
-          :loading_indicator => true
-        }
-        options = defaults.merge(options)
-        button = content_tag('div', :class => 'button_with_label' + (options[:active] ? ' active' : '')) do
-          link = if options[:overlay]
-            link_to_overlay_window(
-              render_icon(options[:icon]),
-              options[:url],
-              options[:overlay_options],
-              {
-                :class => 'icon_button',
-                :title => options[:title],
-                'data-alchemy-hotkey' => options[:hotkey]
-              }.merge(options[:link_options])
-            )
-          else
-            link_to options[:url], {:class => ("icon_button#{options[:loading_indicator] ? ' please_wait' : nil}"), :title => options[:title], 'data-alchemy-hotkey' => options[:hotkey]}.merge(options[:link_options]) do
-              render_icon(options[:icon])
-            end
-          end
-          link += content_tag('label', options[:label])
-        end
-        if options[:skip_permission_check]
-          return button
+        options = {
+          overlay: true,
+          skip_permission_check: false,
+          active: false,
+          link_options: {},
+          overlay_options: {},
+          loading_indicator: true
+        }.merge(options.symbolize_keys)
+        button = render(
+          'alchemy/admin/partials/toolbar_button',
+          options: options
+        )
+        if options[:skip_permission_check] || permitted_to?(*permission_from_options(options))
+          button
         else
-          if options[:if_permitted_to].blank?
-            action_controller = options[:url].gsub(/^\//, '').split('/')
-            options[:if_permitted_to] = [action_controller.last.to_sym, action_controller[0..action_controller.length-2].join('_').to_sym]
-          end
-          if permitted_to?(*options[:if_permitted_to])
-            return button
-          else
-            return ""
-          end
+          ""
         end
       end
 
@@ -624,6 +425,24 @@ module Alchemy
         "#{controller_name} #{action_name}"
       end
 
+    private
+
+      def permission_from_options(options)
+        if options[:if_permitted_to].blank?
+          options[:if_permitted_to] = permission_array_from_url(options)
+        else
+          options[:if_permitted_to]
+        end
+      end
+
+      def permission_array_from_url(options)
+        action_controller = options[:url].gsub(/^\//, '').split('/')
+        [
+          action_controller.last.to_sym,
+          action_controller[0..action_controller.length-2].join('_').to_sym
+        ]
+      end
+
     end
   end
 end