alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -1,42 +1,39 @@
 module Alchemy
   module Admin
-    class PicturesController < Alchemy::Admin::BaseController
+    class PicturesController < Alchemy::Admin::ResourcesController
+      include UploaderResponses
+
       helper 'alchemy/admin/tags'
 
-      before_action :load_picture,
-        only: [:show, :edit, :update, :info, :destroy]
+      before_action :load_resource,
+        only: [:show, :edit, :update, :destroy, :info]
 
       authorize_resource class: Alchemy::Picture
 
       def index
         @size = params[:size].present? ? params[:size] : 'medium'
-        @pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
+        @query = Picture.ransack(params[:q])
+        @pictures = Picture.search_by(params, @query, pictures_per_page_for_size(@size))
+
         if in_overlay?
           archive_overlay
         end
       end
 
-      def new
-        @picture = Picture.new
-        set_size_or_default
-        if in_overlay?
-          set_instance_variables
-        end
+      def show
+        @previous = @picture.previous(params)
+        @next = @picture.next(params)
+        @pages = @picture.essence_pictures.group_by(&:page)
+        render action: 'show'
       end
 
       def create
         @picture = Picture.new(picture_params)
         @picture.name = @picture.humanized_name
         if @picture.save
-          set_size_or_default
-          if in_overlay?
-            set_instance_variables
-          end
-          message = _t('Picture uploaded succesfully', name: @picture.name)
-          render json: {files: [@picture.to_jq_upload], growl_message: message}, status: :created
+          render succesful_uploader_response(file: @picture)
         else
-          message = _t('Picture validation error', name: @picture.name)
-          render json: {files: [@picture.to_jq_upload], growl_message: message}, status: :unprocessable_entity
+          render failed_uploader_response(file: @picture)
         end
       end
 
@@ -46,12 +43,18 @@ module Alchemy
       end
 
       def update
-        if @picture.update_attributes(picture_params)
-          flash[:notice] = _t(:picture_updated_successfully, name: @picture.name)
+        if @picture.update(picture_params)
+          @message = {
+            body: Alchemy.t(:picture_updated_successfully, name: @picture.name),
+            type: 'notice'
+          }
         else
-          flash[:error] = _t(:picture_update_failed)
+          @message = {
+            body: Alchemy.t(:picture_update_failed),
+            type: 'error'
+          }
         end
-        redirect_to_index
+        render :update
       end
 
       def update_multiple
@@ -59,7 +62,7 @@ module Alchemy
         @pictures.each do |picture|
           picture.update_name_and_tag_list!(params)
         end
-        flash[:notice] = _t("Pictures updated successfully")
+        flash[:notice] = Alchemy.t("Pictures updated successfully")
         redirect_to_index
       end
 
@@ -77,14 +80,17 @@ module Alchemy
             end
           end
           if not_deletable.any?
-            flash[:warn] = _t("These pictures could not be deleted, because they were in use", :names => not_deletable.to_sentence)
+            flash[:warn] = Alchemy.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)
+            flash[:notice] = Alchemy.t("Pictures deleted successfully", names: names.to_sentence)
           end
         else
-          flash[:warn] = _t("Could not delete Pictures")
+          flash[:warn] = Alchemy.t("Could not delete Pictures")
         end
-      rescue Exception => e
+      rescue => e
         flash[:error] = e.message
       ensure
         redirect_to_index
@@ -93,24 +99,20 @@ module Alchemy
       def destroy
         name = @picture.name
         @picture.destroy
-        flash[:notice] = _t("Picture deleted successfully", :name => name)
-      rescue Exception => e
+        flash[:notice] = Alchemy.t("Picture deleted successfully", name: name)
+      rescue => e
         flash[:error] = e.message
       ensure
-        do_redirect_to admin_pictures_path(:per_page => params[:per_page], :page => params[:page], :query => params[:query])
+        redirect_to_index
       end
 
       def flush
         FileUtils.rm_rf Rails.root.join('public', Alchemy::MountPoint.get, 'pictures')
-        @notice = _t('Picture cache flushed')
+        @notice = Alchemy.t('Picture cache flushed')
       end
 
       private
 
-      def load_picture
-        @picture = Picture.find(params[:id])
-      end
-
       def pictures_per_page_for_size(size)
         case size
         when 'small'
@@ -120,7 +122,7 @@ module Alchemy
         else
           per_page = in_overlay? ? 9 : (per_page_value_for_screen_size / 1.0).ceil + 4
         end
-        return per_page
+        per_page
       end
 
       def in_overlay?
@@ -138,31 +140,18 @@ module Alchemy
       end
 
       def redirect_to_index
-        redirect_to admin_pictures_path(
-          query: params[:query],
-          tagged_with: params[:tagged_with],
-          size: params[:size],
-          filter: params[:filter]
+        do_redirect_to admin_pictures_path(
+          filter: params[:filter].presence,
+          page: params[:page].presence,
+          q: params[:q].presence,
+          size: params[:size].presence,
+          tagged_with: params[:tagged_with].presence
         )
       end
 
       def picture_params
         params.require(:picture).permit(:image_file, :upload_hash, :name, :tag_list)
       end
-
-      def set_size_or_default
-        @size = params[:size] || 'medium'
-      end
-
-      def set_instance_variables
-        @while_assigning = true
-        @content = Content.select('id').find_by(id: params[:content_id])
-        @element = Element.select('id').find_by(id: params[:element_id])
-        @options = options_from_params
-        @page = params[:page] || 1
-        @per_page = pictures_per_page_for_size(@size)
-      end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 require 'csv'
 require 'alchemy/resource'
 require 'alchemy/resources_helper'
-require 'handles_sortable_columns'
 
 module Alchemy
   module Admin
@@ -18,22 +17,12 @@ module Alchemy
         authorize!(action_name.to_sym, resource_instance_variable || resource_handler.model)
       end
 
-      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
-        items = resource_handler.model
+        @query = resource_handler.model.ransack(params[:q])
+        items = @query.result
         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)
@@ -60,7 +49,7 @@ module Alchemy
         resource_instance_variable.save
         render_errors_or_redirect(
           resource_instance_variable,
-          resources_path,
+          resources_path(resource_handler.resources_name, current_location_params),
           flash_notice_for_resource_action
         )
       end
@@ -69,7 +58,7 @@ module Alchemy
         resource_instance_variable.update_attributes(resource_params)
         render_errors_or_redirect(
           resource_instance_variable,
-          resources_path,
+          resources_path(resource_handler.resources_name, current_location_params),
           flash_notice_for_resource_action
         )
       end
@@ -77,7 +66,7 @@ module Alchemy
       def destroy
         resource_instance_variable.destroy
         flash_notice_for_resource_action
-        do_redirect_to resource_url_proxy.url_for(action: 'index')
+        do_redirect_to resource_url_proxy.url_for(current_location_params.merge(action: 'index'))
       end
 
       def resource_handler
@@ -98,76 +87,21 @@ module Alchemy
         when :destroy
           verb = "removed"
         end
-        flash[:notice] = _t("#{resource_handler.resource_name.classify} successfully #{verb}", :default => _t("Succesfully #{verb}"))
+        flash[:notice] = Alchemy.t("#{resource_handler.resource_name.classify} successfully #{verb}", default: Alchemy.t("Succesfully #{verb}"))
       end
 
       def is_alchemy_module?
-        not alchemy_module.nil? and not alchemy_module['engine_name'].nil?
+        !alchemy_module.nil? && !alchemy_module['engine_name'].nil?
       end
 
       def alchemy_module
-        @alchemy_module ||= module_definition_for(:controller => params[:controller], :action => 'index')
+        @alchemy_module ||= module_definition_for(controller: params[:controller], action: 'index')
       end
 
       def load_resource
         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.eager_load(resource_handler.model_association_names).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]
-            "LOWER(#{relation[:model_association].klass.table_name}.#{relation[:attr_method]}) LIKE #{search_terms}"
-          else
-            "LOWER(#{resource_handler.model.table_name}.#{attribute[:name]}) LIKE #{search_terms}"
-          end
-        end.join(" OR ")
-      end
-
       # Permits all parameters as default!
       #
       # THIS IS INSECURE! Although only signed in admin users can send requests anyway, but we should change this.
@@ -179,7 +113,6 @@ module Alchemy
       def resource_params
         params.require(resource_handler.namespaced_resource_name).permit!
       end
-
     end
   end
 end

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

@@ -4,9 +4,12 @@ module Alchemy
       before_filter :load_tag, only: [:edit, :update, :destroy]
 
       def index
-        @tags = ActsAsTaggableOn::Tag.where(
-          "name LIKE '%#{params[:query]}%'"
-        ).page(params[:page] || 1).per(per_page_value_for_screen_size).order("name ASC")
+        @query = ActsAsTaggableOn::Tag.ransack(params[:q])
+        @tags = @query
+                  .result
+                  .page(params[:page] || 1)
+                  .per(per_page_value_for_screen_size)
+                  .order("name ASC")
       end
 
       def new
@@ -15,7 +18,7 @@ module Alchemy
 
       def create
         @tag = ActsAsTaggableOn::Tag.create(tag_params)
-        render_errors_or_redirect @tag, admin_tags_path, _t('New Tag Created')
+        render_errors_or_redirect @tag, admin_tags_path, Alchemy.t('New Tag Created')
       end
 
       def edit
@@ -26,12 +29,12 @@ module Alchemy
         if tag_params[:merge_to]
           @new_tag = ActsAsTaggableOn::Tag.find(tag_params[:merge_to])
           Tag.replace(@tag, @new_tag)
-          operation_text = _t('Replaced Tag') % {old_tag: @tag.name, new_tag: @new_tag.name}
+          operation_text = Alchemy.t('Replaced Tag') % {old_tag: @tag.name, new_tag: @new_tag.name}
           @tag.destroy
         else
           @tag.update_attributes(tag_params)
           @tag.save
-          operation_text = _t(:successfully_updated_tag)
+          operation_text = Alchemy.t(:successfully_updated_tag)
         end
         render_errors_or_redirect @tag, admin_tags_path, operation_text
       end
@@ -39,7 +42,7 @@ module Alchemy
       def destroy
         if request.delete?
           @tag.destroy
-          flash[:notice] = _t(:successfully_deleted_tag)
+          flash[:notice] = Alchemy.t(:successfully_deleted_tag)
         end
         do_redirect_to admin_tags_path
       end
@@ -70,7 +73,6 @@ module Alchemy
           {id: value, text: value}
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Alchemy
   module Admin
     class TrashController < Alchemy::Admin::BaseController
-
       helper "alchemy/admin/elements"
 
       authorize_resource class: false
@@ -10,10 +9,6 @@ module Alchemy
         @elements = Element.trashed
         @page = Page.find(params[:page_id])
         @allowed_elements = @page.available_element_definitions
-        @draggable_trash_items = {}
-        @elements.each do |element|
-          @draggable_trash_items["element_#{element.id}"] = element.available_page_cell_names(@page)
-        end
       end
 
       def clear
@@ -21,7 +16,6 @@ module Alchemy
         @elements = Element.trashed
         @elements.map(&:destroy)
       end
-
     end
   end
 end

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

@@ -1,6 +1,5 @@
 module Alchemy
   class Api::ContentsController < Api::BaseController
-
     # Returns all contents as json object
     #
     # You can either load all or only these for :element_id param

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

@@ -1,6 +1,5 @@
 module Alchemy
   class Api::ElementsController < Api::BaseController
-
     # Returns all elements as json object
     #
     # You can either load all or only these for :page_id param

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

@@ -25,7 +25,10 @@ module Alchemy
 
     def load_page
       @page = Page.find_by(id: params[:id]) ||
-              Page.find_by(urlname: params[:urlname]) ||
+              Language.current.pages.find_by(
+                urlname: params[:urlname],
+                language_code: params[:locale] || Language.current.code
+              ) ||
               raise(ActiveRecord::RecordNotFound)
     end
   end

data/app/controllers/alchemy/attachments_controller.rb

@@ -5,8 +5,8 @@ module Alchemy
 
     # sends file inline. i.e. for viewing pdfs/movies in browser
     def show
-      send_data(
-        @attachment.file.data,
+      send_file(
+        @attachment.file.path,
         {
           filename: @attachment.file_name,
           type: @attachment.file_mime_type,
@@ -17,8 +17,8 @@ module Alchemy
 
     # sends file as attachment. aka download
     def download
-      send_data(
-        @attachment.file.data, {
+      send_file(
+        @attachment.file.path, {
           filename: @attachment.file_name,
           type: @attachment.file_mime_type
         }
@@ -30,6 +30,5 @@ module Alchemy
     def load_attachment
       @attachment = Attachment.find(params[:id])
     end
-
   end
 end