alchemy_cms 2.5.3.1 → 2.6.0.rc5

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

@@ -22,12 +22,6 @@ module Alchemy
         show_error_notice(e)
       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
-
       # Displays an error notice in the Alchemy backend.
       def show_error_notice(e)
         # truncate the message, because very long error messages (i.e from mysql2) causes cookie oveflow errors
@@ -42,10 +36,10 @@ module Alchemy
       end
 
       def redirect_back_or_to_default(default_path = admin_dashboard_path)
-        if request.env["HTTP_REFERER"].blank?
-          redirect_to default_path
-        else
+        if request.referer.present?
           redirect_to :back
+        else
+          redirect_to default_path
         end
       end
 

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

@@ -7,7 +7,7 @@ module Alchemy
         @clipboard = get_clipboard
         @clipboard_items = model_class.all_from_clipboard(@clipboard.all(params[:remarkable_type]))
         respond_to do |format|
-          format.html { render :layout => false }
+          format.html { render layout: !request.xhr? }
         end
       end
 

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

@@ -8,7 +8,7 @@ module Alchemy
         @element = Element.find(params[:element_id])
         @contents = @element.available_contents
         @content = @element.contents.build
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def create

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

@@ -14,7 +14,7 @@ module Alchemy
 
       def info
         @alchemy_version = Alchemy.version
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def update_check

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

@@ -12,7 +12,7 @@ module Alchemy
         else
           @elements = @page.elements_grouped_by_cells
         end
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def list
@@ -31,7 +31,7 @@ module Alchemy
         unless clipboard_elements.blank?
           @clipboard_items = Element.all_from_clipboard_for_page(clipboard_elements, @page)
         end
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
@@ -65,7 +65,7 @@ module Alchemy
       # And then updates the element itself.
       def update
         @element = Element.find_by_id(params[:id])
-        if @element.save_contents(params)
+        if @element.save_contents(params[:contents])
           @page = @element.page
           @element_validated = @element.update_attributes!(params[:element])
         else

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

@@ -7,7 +7,7 @@ module Alchemy
       def edit
         @content = Content.find(params[:id])
         @essence_file = @content.essence
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def update

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

@@ -10,7 +10,7 @@ module Alchemy
         @essence_picture = EssencePicture.find(params[:id])
         @content = Content.find(params[:content_id])
         @options = params[:options] || {}
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def crop
@@ -44,7 +44,7 @@ module Alchemy
         else
           @no_image_notice = _t('No image found. Did you saved the element?')
         end
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def update
@@ -55,8 +55,8 @@ module Alchemy
       end
 
       def assign
-        @content = Content.find(params[:id])
-        @picture = Picture.find(params[:picture_id])
+        @content = Content.find_by_id(params[:id])
+        @picture = Picture.find_by_id(params[:picture_id])
         @content.essence.picture = @picture
         @options = params[:options] || {}
         @element = @content.element
@@ -76,7 +76,7 @@ module Alchemy
         @picture_essence.link = params[:link]
         @picture_essence.link_title = params[:title]
         @picture_essence.open_link_in_new_window = params[:blank]
-        @notice = _t("saved_link")
+        @notice = _t(:saved_link)
         @picture_essence.save
       end
 

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

@@ -8,7 +8,7 @@ module Alchemy
         render :layout => !request.xhr?
       end
 
-      protected
+    protected
 
       def configured_page_layout
         Alchemy::Config.get(:default_language).try('[]', 'page_layout')

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

@@ -45,14 +45,15 @@ module Alchemy
         @page = Page.new(:layoutpage => params[:layoutpage] == 'true', :parent_id => params[:parent_id])
         @page_layouts = PageLayout.layouts_for_select(session[:language_id], @page.layoutpage?)
         @clipboard_items = Page.all_from_clipboard_for_select(get_clipboard[:pages], session[:language_id], @page.layoutpage?)
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def create
         parent = Page.find_by_id(params[:page][:parent_id]) || Page.root
         params[:page][:language_id] ||= parent.language ? parent.language.id : Language.get_default.id
         params[:page][:language_code] ||= parent.language ? parent.language.code : Language.get_default.code
-        if !params[:paste_from_clipboard].blank?
+        # Copy the page
+        if params[:paste_from_clipboard].present?
           source_page = Page.find(params[:paste_from_clipboard])
           @page = Page.copy(source_page, {
             :parent_id => params[:page][:parent_id],
@@ -64,14 +65,15 @@ module Alchemy
             source_page.copy_children_to(@page)
           end
         else
-          @page = Page.create(params[:page])
+          # Create new page
+          @page = Page.new(params[:page])
+        end
+        if @page.save
+          redirect_path = params[:redirect_to] || edit_admin_page_path(@page)
+        else
+          # TODO: Make a rollback, because the page is already persisted here.
+          redirect_path = admin_pages_path
         end
-        redirect_path =
-          if @page.valid?
-            params[:redirect_to] || edit_admin_page_path(@page)
-          else
-            admin_pages_path
-          end
         render_errors_or_redirect(@page, redirect_path, _t("Page created", :name => @page.name))
       end
 
@@ -79,7 +81,7 @@ module Alchemy
       def edit
         # fetching page via before filter
         if @page.locked? && @page.locker && @page.locker.logged_in? && @page.locker != current_user
-          flash[:notice] = _t("This page is locked by %{name}", :name => (@page.locker.name rescue _t('unknown')))
+          flash[:notice] = _t("This page is locked by %{name}", :name => (@page.locker.name rescue _t(:unknown)))
           redirect_to admin_pages_path
         else
           @page.lock(current_user)
@@ -92,10 +94,10 @@ module Alchemy
       def configure
         # fetching page via before filter
         if @page.redirects_to_external?
-          render :action => 'configure_external', :layout => false
+          render action: 'configure_external', layout: !request.xhr?
         else
           @page_layouts = PageLayout.layouts_with_own_for_select(@page.page_layout, session[:language_id], @page.layoutpage?)
-          render :layout => false
+          render layout: !request.xhr?
         end
       end
 
@@ -144,7 +146,7 @@ module Alchemy
         if multi_language?
           @url_prefix = "#{session[:language_code]}/"
         end
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def fold
@@ -160,7 +162,7 @@ module Alchemy
       def unlock
         # fetching page via before filter
         @page.unlock
-        flash[:notice] = _t("unlocked_page", :name => @page.name)
+        flash[:notice] = _t(:unlocked_page, :name => @page.name)
         @pages_locked_by_user = Page.from_current_site.all_locked_by(current_user)
         respond_to do |format|
           format.js
@@ -179,7 +181,7 @@ module Alchemy
       def publish
         # fetching page via before filter
         @page.publish!
-        flash[:notice] = _t("page_published", :name => @page.name)
+        flash[:notice] = _t(:page_published, :name => @page.name)
         redirect_back_or_to_default(admin_pages_path)
       end
 
@@ -197,7 +199,7 @@ module Alchemy
         )
         new_language_root.move_to_child_of Page.root
         original_language_root.copy_children_to(new_language_root)
-        flash[:notice] = _t('language_pages_copied')
+        flash[:notice] = _t(:language_pages_copied)
         redirect_to params[:layoutpage] == "true" ? admin_layoutpages_path : :action => :index
       end
 

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

@@ -2,6 +2,7 @@ module Alchemy
   module Admin
     class PicturesController < Alchemy::Admin::BaseController
       protect_from_forgery :except => [:create]
+      helper 'alchemy/admin/tags'
 
       cache_sweeper Alchemy::PicturesSweeper, :only => [:update, :destroy]
 
@@ -37,7 +38,7 @@ module Alchemy
           @page = params[:page]
           @per_page = params[:per_page]
         end
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def create
@@ -68,6 +69,11 @@ module Alchemy
         end
       end
 
+      def show
+        @picture = Picture.find(params[:id])
+        render layout: !request.xhr?
+      end
+
       def edit
         @picture = Picture.find(params[:id])
         render :layout => !request.xhr?
@@ -82,9 +88,9 @@ module Alchemy
         @picture = Picture.find(params[:id])
 
         if @picture.update_attributes(params[:picture])
-          flash[:notice] = _t('picture_updated_successfully', :name => @picture.name)
+          flash[:notice] = _t(:picture_updated_successfully, :name => @picture.name)
         else
-          flash[:error] = _t('picture_update_failed')
+          flash[:error] = _t(:picture_update_failed)
         end
         redirect_to_index
       end
@@ -146,14 +152,9 @@ module Alchemy
         @notice = _t('Picture cache flushed')
       end
 
-      def show_in_window
-        @picture = Picture.find(params[:id])
-        render :layout => false
-      end
-
       def info
         @picture = Picture.find(params[:id])
-        render :layout => false
+        render layout: !request.xhr?
       end
 
     private
@@ -171,7 +172,7 @@ module Alchemy
       end
 
       def in_overlay?
-        !params[:element_id].blank?
+        params[:element_id].present?
       end
 
       def archive_overlay

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

@@ -1,3 +1,5 @@
+require 'csv'
+
 module Alchemy
   module Admin
     class ResourcesController < Alchemy::Admin::BaseController
@@ -8,25 +10,40 @@ module Alchemy
 
       before_filter :load_resource, :only => [:show, :edit, :update, :destroy]
 
+      handles_sortable_columns do |c|
+        c.default_sort_value = :name
+        c.link_class = 'sortable'
+        c.indicator_class = {:asc => "sorted asc", :desc => "sorted desc"}
+        c.indicator_text = {:asc => "<i>&nbsp;&darr;&nbsp;</i>", :desc => "<i>&nbsp;&uarr;&nbsp;</i>"}
+      end
+
       def index
-        if params[:query].blank?
-          items = resource_handler.model
-        else
-          search_terms = ActiveRecord::Base.sanitize("%#{params[:query]}%")
-          items = resource_handler.model.where(resource_handler.searchable_attributes.map { |attribute|
-            "`#{resource_handler.model.table_name}`.`#{attribute[:name]}` LIKE #{search_terms}"
-          }.join(" OR "))
+        items = resource_handler.model
+        if contains_relations?
+          items = items.includes(*resource_relations_names)
+        end
+        if params[:query].present?
+          items = query_items(items)
+        end
+        items = items.order(sort_order)
+        respond_to do |format|
+          format.html {
+            items = items.page(params[:page] || 1).per(per_page_value_for_screen_size)
+            instance_variable_set("@#{resource_handler.resources_name}", items)
+          }
+          format.csv {
+            instance_variable_set("@#{resource_handler.resources_name}", items)
+          }
         end
-        instance_variable_set("@#{resource_handler.resources_name}", items.page(params[:page] || 1).per(per_page_value_for_screen_size))
       end
 
       def new
-        instance_variable_set("@#{resource_handler.model_name}", resource_handler.model.new)
+        instance_variable_set("@#{resource_handler.resource_name}", resource_handler.model.new)
         render :layout => !request.xhr?
       end
 
       def show
-        render :layout => !request.xhr?
+        render action: 'edit', layout: !request.xhr?
       end
 
       def edit
@@ -34,7 +51,7 @@ module Alchemy
       end
 
       def create
-        instance_variable_set("@#{resource_handler.model_name}", resource_handler.model.new(params[resource_handler.namespaced_model_name.to_sym]))
+        instance_variable_set("@#{resource_handler.resource_name}", resource_handler.model.new(params[resource_handler.namespaced_resource_name.to_sym]))
         resource_instance_variable.save
         render_errors_or_redirect(
           resource_instance_variable,
@@ -44,7 +61,7 @@ module Alchemy
       end
 
       def update
-        resource_instance_variable.update_attributes(params[resource_handler.namespaced_model_name.to_sym])
+        resource_instance_variable.update_attributes(params[resource_handler.namespaced_resource_name.to_sym])
         render_errors_or_redirect(
           resource_instance_variable,
           resources_path,
@@ -75,7 +92,7 @@ module Alchemy
         when :destroy
           verb = "removed"
         end
-        flash[:notice] = _t("#{resource_handler.model_name.classify} successfully #{verb}", :default => _t("Succesfully #{verb}"))
+        flash[:notice] = _t("#{resource_handler.resource_name.classify} successfully #{verb}", :default => _t("Succesfully #{verb}"))
       end
 
       def is_alchemy_module?
@@ -87,8 +104,64 @@ module Alchemy
       end
 
       def load_resource
-        instance_variable_set("@#{resource_handler.model_name}", resource_handler.model.find(params[:id]))
+        instance_variable_set("@#{resource_handler.resource_name}", resource_handler.model.find(params[:id]))
+      end
+
+      # Returns a sort order for AR#sort method
+      #
+      # Falls back to fallback_sort_order, if the requested column is not a column of model.
+      #
+      # If the column is a tablename and column combination that matches any resource relations, than this order will be taken.
+      #
+      def sort_order
+        sortable_column_order do |column, direction|
+          if resource_handler.model_associations.present? && column.match(/\./)
+            table, column = column.split('.')
+            if resource_handler.model_associations.detect { |a| a.table_name == table }
+              "#{table}.#{column} #{direction}"
+            else
+              fallback_sort_order(direction)
+            end
+          elsif resource_handler.model.column_names.include?(column.to_s)
+            "#{resource_handler.model.table_name}.#{column} #{direction}"
+          else
+            fallback_sort_order(direction)
+          end
+        end
+      end
+
+      # Default sort order fallback
+      #
+      # Overwrite this in your controller to define custom fallback
+      #
+      def fallback_sort_order(direction)
+        "#{resource_handler.model.table_name}.id #{direction}"
+      end
+
+      # Returns an activerecord object that contains items matching params[:query]
+      #
+      def query_items(items)
+        query = params[:query].downcase.split(' ').join('%')
+        query = ActiveRecord::Base.sanitize("%#{query}%")
+        items.where(search_query(query))
+      end
+
+      # Returns a search query string
+      #
+      # It queries all searchable attributes from resource model via LIKE and joins them via OR.
+      #
+      # If the attribute is a relation it builds the query for the associated table.
+      #
+      def search_query(search_terms)
+        resource_handler.searchable_attributes.map do |attribute|
+          if relation = attribute[:relation]
+            "#{relation[:model_association].klass.table_name}.#{relation[:attr_method]} LIKE #{search_terms}"
+          else
+            "#{resource_handler.model.table_name}.#{attribute[:name]} LIKE #{search_terms}"
+          end
+        end.join(" OR ")
       end
+
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module Alchemy
   module Admin
-    class TagsController < BaseController
+    class TagsController < ResourcesController
 
       before_filter :load_tag, :only => [:edit, :update, :destroy]
 
@@ -12,7 +12,7 @@ module Alchemy
 
       def new
         @tag = ActsAsTaggableOn::Tag.new
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def create
@@ -22,7 +22,7 @@ module Alchemy
 
       def edit
         @tags = ActsAsTaggableOn::Tag.order("name ASC").all - [@tag]
-        render :layout => false
+        render layout: !request.xhr?
       end
 
       def update