alchemy_cms 2.5.3.1 → 2.6.0.rc5

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

@@ -6,15 +6,15 @@ module Alchemy
 
       def index
         @elements = Element.trashed
-        @page = Page.find_by_id(params[:page_id])
+        @page = Page.find(params[:page_id])
         @allowed_elements = Element.all_for_page(@page)
         @draggable_trash_items = {}
         @elements.each { |e| @draggable_trash_items["element_#{e.id}"] = e.belonging_cellnames(@page) }
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def clear
-        @page = Page.find_by_id(params[:page_id])
+        @page = Page.find(params[:page_id])
         @elements = Element.trashed
         @elements.map(&:destroy)
       end

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

@@ -1,12 +1,16 @@
 module Alchemy
   module Admin
-    class UsersController < Alchemy::Admin::BaseController
+    class UsersController < ResourcesController
 
       filter_access_to [:edit, :update, :destroy], :attribute_check => true, :load_method => :load_user, :model => Alchemy::User
       filter_access_to [:index, :new, :create], :attribute_check => false
 
       before_filter :set_roles_and_genders, :except => [:index, :destroy]
 
+      handles_sortable_columns do |c|
+        c.default_sort_value = :login
+      end
+
       def index
         if !params[:query].blank?
           users = User.where([
@@ -19,12 +23,7 @@ module Alchemy
         else
           users = User.scoped
         end
-        @users = users.page(params[:page] || 1).per(per_page_value_for_screen_size).order('login')
-      end
-
-      def new
-        @user = User.new
-        render :layout => false
+        @users = users.page(params[:page] || 1).per(per_page_value_for_screen_size).order(sort_order)
       end
 
       def create
@@ -43,10 +42,6 @@ module Alchemy
         )
       end
 
-      def edit
-        render :layout => false
-      end
-
       def update
         # User is fetched via before filter
         params[:user].delete(:role) unless permitted_to?(:update_role)

data/app/controllers/alchemy/attachments_controller.rb

@@ -5,11 +5,11 @@ module Alchemy
 
     # sends file inline. i.e. for viewing pdfs/movies in browser
     def show
-      send_file(
-        @attachment.public_filename,
+      send_data(
+        @attachment.file.data,
         {
-          :name => @attachment.filename,
-          :type => @attachment.content_type,
+          :filename => @attachment.file_name,
+          :type => @attachment.file_mime_type,
           :disposition => 'inline'
         }
       )
@@ -17,11 +17,10 @@ module Alchemy
 
     # sends file as attachment. aka download
     def download
-      send_file(
-        @attachment.full_filename, {
-          :name => @attachment.filename,
-          :type => @attachment.content_type,
-          :disposition => 'attachment'
+      send_data(
+        @attachment.file.data, {
+          :filename => @attachment.file_name,
+          :type => @attachment.file_mime_type
         }
       )
     end

data/app/controllers/alchemy/base_controller.rb

@@ -10,18 +10,13 @@ module Alchemy
     before_filter :set_language
     before_filter :mailer_set_url_options
     before_filter :store_user_request_time
+    before_filter :set_authorization_user
 
     helper_method :current_server, :current_site, :multi_site?
 
     # Returns a host string with the domain the app is running on.
     def current_server
-      # For local development server
-      if request.port != 80
-        "#{request.protocol}#{request.host}:#{request.port}"
-        # For remote production server
-      else
-        "#{request.protocol}#{request.host}"
-      end
+     "#{request.protocol}#{request.host_with_port}"
     end
 
     # Returns the configuratin value of given key.
@@ -64,6 +59,12 @@ module Alchemy
       Site.current = current_site
     end
 
+    # Stores the current_user for declarative_authorization
+    #
+    def set_authorization_user
+      Authorization.current_user = current_user
+    end
+
     # Sets Alchemy's GUI translation to users preffered language and stores it in the session.
     #
     # Guesses the language from browser locale. If not successful it takes the default.
@@ -203,9 +204,7 @@ module Alchemy
 
     def permission_denied
       if current_user
-        if current_user.role == 'registered'
-          redirect_to alchemy.root_path
-        else
+        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?
@@ -221,6 +220,8 @@ module Alchemy
             flash[:error] = _t('You are not authorized')
             redirect_to alchemy.admin_dashboard_path
           end
+        else
+          redirect_to alchemy.root_path
         end
       else
         flash[:info] = _t('Please log in')
@@ -233,5 +234,11 @@ module Alchemy
       end
     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"))
+    end
+
   end
 end

data/app/controllers/alchemy/pages_controller.rb

@@ -98,8 +98,8 @@ module Alchemy
       @page ||= load_page
       if User.admins.count == 0 && @page.nil?
         redirect_to signup_path
-      elsif @page.nil? && legacy_url = LegacyPageUrl.where(urlname: params[:urlname]).last
-        @page = legacy_url.page
+      elsif @page.nil? && last_legacy_url
+        @page = last_legacy_url.page
         redirect_page
       elsif @page.blank?
         raise_not_found_error
@@ -113,12 +113,6 @@ module Alchemy
         redirect_page
       elsif !multi_language? && !params[:lang].blank?
         redirect_page
-      elsif configuration(:url_nesting) && url_levels.any? && !levels_are_in_page_branch?
-        raise_not_found_error
-      elsif configuration(:url_nesting) && should_be_nested? && !url_levels.any?
-        redirect_page(params_for_nested_url)
-      elsif !configuration(:url_nesting) && url_levels.any?
-        redirect_page
       elsif @page.has_controller?
         redirect_to main_app.url_for(@page.controller_and_action)
       else
@@ -152,22 +146,16 @@ module Alchemy
 
     def additional_params
       params.each do |key, value|
-        params[key] = nil if ["action", "controller", "urlname", "lang", "level1", "level2", "level3"].include?(key)
+        params[key] = nil if ["action", "controller", "urlname", "lang"].include?(key)
       end
     end
 
-    def url_levels
-      params.keys.grep(/^level[1-3]$/)
-    end
-
-    def levels_are_in_page_branch?
-      nested_urlnames = breadcrumb(@page).collect(&:urlname)
-      level_names = params.select { |k, v| url_levels.include?(k) }.map(&:second)
-      level_names & nested_urlnames == level_names
+    def legacy_urls
+      LegacyPageUrl.joins(:page).where(urlname: params[:urlname], alchemy_pages: {language_id: session[:language_id]})
     end
 
-    def should_be_nested?
-      !params_for_nested_url.blank?
+    def last_legacy_url
+      legacy_urls.last
     end
 
   end

data/app/controllers/alchemy/passwords_controller.rb

@@ -1,12 +1,16 @@
 module Alchemy
   class PasswordsController < Devise::PasswordsController
+    include Alchemy::FerretSearch
+    helper 'Alchemy::Admin::Base', 'Alchemy::Pages'
 
     before_filter { enforce_ssl if ssl_required? && !request.ssl? }
     before_filter :set_translation
 
-    layout 'alchemy/admin'
+    layout 'alchemy/login'
 
-    helper 'Alchemy::Admin::Base'
+    def new
+      build_resource(email: params[:email])
+    end
 
   private
 
@@ -19,5 +23,13 @@ module Alchemy
       alchemy.edit_password_url(options)
     end
 
+    def after_sign_in_path_for(resource_or_scope)
+      if permitted_to?(:index, :alchemy_admin_dashboard)
+        alchemy.admin_dashboard_path
+      else
+        alchemy.root_path
+      end
+    end
+
   end
-end
+end

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -1,13 +1,14 @@
 module Alchemy
   class UserSessionsController < Devise::SessionsController
+    # Necessary because this controller is also used for general login.
+    include Alchemy::FerretSearch
+    helper 'Alchemy::Admin::Base', 'Alchemy::Pages'
 
     before_filter { enforce_ssl if ssl_required? && !request.ssl? }
     before_filter :set_translation
     before_filter :check_user_count, :only => :new
 
-    layout 'alchemy/admin'
-
-    helper 'Alchemy::Admin::Base'
+    layout 'alchemy/login'
 
     def new
       super
@@ -30,7 +31,7 @@ module Alchemy
     end
 
     def leave
-      render :layout => false
+      render layout: !request.xhr?
     end
 
     def destroy

data/app/controllers/alchemy/users_controller.rb

@@ -12,7 +12,7 @@ module Alchemy
 
     def new
       @signup = true
-      @user = User.new(:role => 'admin')
+      @user = User.new(:roles => 'admin')
     end
 
     def create

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

@@ -2,8 +2,8 @@ module Alchemy
   module Admin
     module AttachmentsHelper
 
-      def mime_to_human mime
-        Alchemy::I18n.t(mime, :scope => :mime_types, :default => _t('document'))
+      def mime_to_human(mime)
+        I18n.t(mime, scope: 'mime_types', default: _t(:document))
       end
 
     end

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

@@ -11,6 +11,7 @@ module Alchemy
     # * link_to_confirmation_window
     #
     module BaseHelper
+      include Alchemy::BaseHelper
 
       # This helper renders the link for an overlay window.
       #
@@ -32,17 +33,13 @@ module Alchemy
           :resizable => false
         }
         options = default_options.merge(options)
-        size = options[:size].to_s.split('x')
+        size = options.delete(:size).to_s.split('x')
         link_to(content, url,
           html_options.merge(
-            'data-alchemy-overlay' => {
-              :size_x => size && size[0] ? size[0] : 'auto',
-              :size_y => size && size[1] ? size[1] : 'auto',
-              :resizable => options[:resizable],
-              :modal => options[:modal],
-              :overflow => options[:overflow],
-              :title => options[:title]
-            }.to_json
+            'data-alchemy-overlay' => options.update(
+              :width => size && size[0] ? size[0] : 'auto',
+              :height => size && size[1] ? size[1] : 'auto',
+            ).to_json
           )
         )
       end
@@ -82,30 +79,25 @@ module Alchemy
         end
       end
 
-      # Used by Alchemy to display a javascript driven filter for lists in the Alchemy cockpit.
-      def js_filter_field options = {}
-        default_options = {
-          :class => "thin_border js_filter_field",
-          :onkeyup => "Alchemy.ListFilter('#contact_list li')",
-          :id => "search_field"
-        }
-        options = default_options.merge(options)
-        options[:onkeyup] << "; jQuery('##{options[:id]}').val().length >= 1 ? jQuery('.js_filter_field_clear').show() : jQuery('.js_filter_field_clear').hide();"
-        filter_field = '<div class="js_filter_field_box">'
-        filter_field << text_field_tag("filter", '', options)
-        filter_field << content_tag('span', '', :class => 'icon search')
-        filter_field << link_to('', '#', {
-          :onclick => "jQuery('##{options[:id]}').val(''); #{options[:onkeyup]}",
-          :class => "js_filter_field_clear",
-          :style => "display: none",
-          :title => _t("click_to_show_all")
-        })
-        filter_field << %(<label for="#{options[:id]}">#{_t(:search)}</label>)
-        filter_field << '</div>'
-        filter_field.html_safe
-      end
-
-      # Returns a link that opens a modal confirmation window.
+      # Used by Alchemy to display a javascript driven filter for lists.
+      #
+      # @param [String] a jquery compatible selector string that represents the items to filter
+      # @param [Hash] html options passed to the input field
+      #
+      def js_filter_field(items, options = {})
+        options = {
+          class: 'js_filter_field',
+          data: {'alchemy-list-filter' => items}
+        }.merge(options)
+        content_tag(:div, class: 'js_filter_field_box') do
+          concat text_field_tag(nil, nil, options)
+          concat content_tag('span', '', class: 'icon search')
+          concat link_to('', '', class: 'js_filter_field_clear', title: _t(:click_to_show_all))
+          concat content_tag(:label, _t(:search), for: options[:id])
+        end
+      end
+
+      # Returns a link that opens a modal confirmation to delete window.
       #
       # === Parameters:
       #
@@ -122,7 +114,7 @@ module Alchemy
         link_to(link_string, url,
           html_options.merge(
             'data-alchemy-confirm-delete' => {
-              :title => _t("please_confirm"),
+              :title => _t(:please_confirm),
               :message => message,
               :ok_label => _t("Yes"),
               :cancel_label => _t("No")
@@ -131,6 +123,35 @@ module Alchemy
         )
       end
 
+      # Returns a form and a button that opens a modal confirm window.
+      #
+      # After confirmation it proceeds to send the form's action.
+      #
+      # === Parameters:
+      #
+      # 1. The content inside the <a> tag
+      # 2. The url that gets opened after confirmation
+      # 3. Options for the Alchemy confirm overlay (See: app/assets/javascripts/alchemy/alchemy.window.js#openConfirmWindow)
+      # 4. HTML options that get passed to the button_tag helper.
+      #
+      # NOTE: The method option in the html_options hash gets passed to the form_tag helper!
+      #
+      # === Example:
+      #
+      #   <%= button_with_confirm('pay', '/admin/orders/1/pay', message: 'Do you really want to mark this order as payed?') %>
+      #
+      def button_with_confirm(value = "", url = "", options = {}, html_options = {})
+        options = {
+          message: _t(:confirm_to_proceed),
+          ok_label: _t("Yes"),
+          title: _t(:please_confirm),
+          cancel_label: _t("No")
+        }.merge(options)
+        form_tag url, {method: html_options.delete(:method)} do
+          button_tag value, html_options.merge('data-alchemy-confirm' => options.to_json)
+        end
+      end
+
       # Returns an Array build for passing it to the options_for_select helper inside an essence editor partial.
       # Usefull for the select_values options from the render_essence_editor helpers.
       #
@@ -192,7 +213,7 @@ module Alchemy
           content = element.contents[content - 1]
         end
         if content.essence.nil?
-          return warning('Element', _t('content_essence_not_found'))
+          return warning('Element', _t(:content_essence_not_found))
         end
         select_options = options_for_select(select_options, content.essence.content)
         select_tag(
@@ -336,6 +357,7 @@ module Alchemy
       #   :label                  [String]              # Text for button label.
       #   :url                    [String]              # Url for link.
       #   :title                  [String]              # Text for title tag.
+      #   :hotkey                 [String]              # Keyboard shortcut for this button. I.E 'alt-n'
       #   :overlay                [Boolean]             # Pass true to open the link in a modal overlay window.
       #   :overlay_options        [Hash]                # Overlay options. See link_to_overlay_window helper.
       #   :if_permitted_to        [Array]               # Check permission for button. [:action, :controller]. Exactly how you defined the permission in your +authorization_rules.rb+. Defaults to controller and action from button url.
@@ -361,11 +383,12 @@ module Alchemy
               options[:overlay_options],
               {
                 :class => 'icon_button',
-                :title => options[:title]
-              }
+                :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]}.merge(options[:link_options]) do
+            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
@@ -427,7 +450,7 @@ module Alchemy
       # NOTE: Alchemy gives you a local variable named like your resource
       #
       def render_resources
-        render :partial => resource_model_name, :collection => resources_instance_variable
+        render :partial => resource_name, :collection => resources_instance_variable
       rescue ActionView::MissingTemplate
         render :partial => 'resource', :collection => resources_instance_variable
       end
@@ -488,57 +511,6 @@ module Alchemy
         current_params.merge(p).delete_if { |k, v| v.blank? }
       end
 
-      # Checks if the pictures tag-filter contains the given tag
-      def pictures_filtered_by_tag?(tag)
-        if params[:tagged_with].present?
-          tags = params[:tagged_with].split(',')
-          tags.include?(tag.name)
-        else
-          false
-        end
-      end
-
-      # Adds the given tag to the pictures tag-filter
-      def add_to_picture_tag_filter(tag)
-        if params[:tagged_with].present?
-          tags = params[:tagged_with].split(',')
-          tags << tag.name
-        else
-          [tag.name]
-        end
-      end
-
-      # Removes the given tag from the pictures tag-filter
-      def remove_from_picture_tag_filter(tag)
-        if params[:tagged_with].present?
-          tags = params[:tagged_with].split(',')
-          tags.delete_if { |t| t == tag.name }
-        else
-          []
-        end
-      end
-
-      # Returns the picture tag-filter from params.
-      # A tag can be added to the filter.
-      # A tag can also be removed.
-      #
-      # Options are:
-      #   * options (Hash):
-      #   ** :add (ActsAsTaggableOn::Tag) - The tag that should be added to the tag-filter
-      #   ** :remove (ActsAsTaggableOn::Tag) - The tag that should be removed from the tag-filter
-      def picture_tag_filter(options={})
-        case
-          when options[:add]
-            taglist = add_to_picture_tag_filter(options[:add]) if options[:add]
-          when options[:remove]
-            taglist = remove_from_picture_tag_filter(options[:remove]) if options[:remove]
-          else
-            return params[:tagged_with]
-        end
-        return nil if taglist.blank?
-        taglist.uniq.join(',')
-      end
-
       def render_hint_for(element)
         return unless element.has_hint?
         link_to '#', :class => 'hint' do