alchemy_cms 2.6.3 → 2.7.0

data/app/assets/stylesheets/alchemy/tables.scss

@@ -145,11 +145,11 @@ td.value {
   overflow: hidden;
 
   p {
-    @include inline-block;
-    width: 214px;
+    background: white;
     text-align: left;
-    margin: $default-form-field-margin;
+    padding: $default-padding 2*$default-padding;
     line-height: 25px;
+    @extend .rounded-border;
   }
 
   &.long {
@@ -182,6 +182,7 @@ td.heading {
   @extend .disable-user-select;
   background-repeat: no-repeat;
   margin: 0 $default-margin;
+  text-indent: -100px;
 }
 
 .list td.icon .icon {
@@ -196,6 +197,15 @@ td, th {
 
   &.center, &.boolean {
     text-align: center;
+
+    .icon {
+      @extend .false;
+    }
+
+    .icon.true {
+      @extend .icon;
+      @extend .true;
+    }
   }
 
   &.right {

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

@@ -20,9 +20,9 @@ module Alchemy
         @attachment = Attachment.new
         if in_overlay?
           @while_assigning = true
-          @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
+          @content = Content.find(params[:content_id], :select => 'id')
           @swap = params[:swap]
-          @options = hashified_options
+          @options = options_from_params
         end
         render :layout => !request.xhr?
       end
@@ -33,7 +33,7 @@ module Alchemy
           @while_assigning = true
           @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
           @swap = params[:swap]
-          @options = hashified_options
+          @options = options_from_params
         end
         @attachments = Attachment.find_paginated(params, per_page_value_for_screen_size, sort_order)
         @message = _t('File %{name} uploaded succesfully', :name => @attachment.name)
@@ -64,7 +64,12 @@ module Alchemy
         @attachment = Attachment.find(params[:id])
         name = @attachment.name
         @attachment.destroy
-        flash[:notice] = _t("File: '%{name}' deleted successfully", :name => name)
+        @url = admin_attachments_url(
+          per_page: params[:per_page],
+          page: params[:page],
+          query: params[:query]
+        )
+        flash[:notice] = _t("File: '%{name}' deleted successfully", name: name)
       end
 
       def show
@@ -90,7 +95,7 @@ module Alchemy
 
       def archive_overlay
         @content = Content.find(params[:content_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/base_controller.rb

@@ -128,6 +128,25 @@ module Alchemy
         (screen_height / 30) - 10
       end
 
+      # Extracts options from params.
+      #
+      # Helps to parse JSONified options into Hash or Array
+      #
+      def options_from_params
+        case params[:options]
+        when ''
+          {}
+        when String
+          JSON.parse(params[:options])
+        when Hash
+          params[:options]
+        when Array
+          params[:options]
+        else
+          {}
+        end.symbolize_keys
+      end
+
     end
   end
 end

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

@@ -14,11 +14,8 @@ module Alchemy
       def create
         @element = Element.find(params[:content][:element_id])
         @content = Content.create_from_scratch(@element, params[:content])
-        @options = params[:options] || {}
+        @options = options_from_params
         @html_options = params[:html_options] || {}
-        if @options.is_a?(String)
-          @options = @options.present? ? JSON.parse(@options) : {}
-        end
         if @content.essence_type == "Alchemy::EssencePicture"
           @content_dom_id = "#add_picture_#{@element.id}"
           @content.essence.picture_id = params[:picture_id]

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

@@ -1,11 +1,12 @@
 require 'net/http'
+require 'alchemy/version'
 
 module Alchemy
   module Admin
     class DashboardController < Alchemy::Admin::BaseController
 
       def index
-        @last_edited_pages = Page.all_last_edited_from(current_user)
+        @last_edited_pages = Page.from_current_site.all_last_edited_from(current_user)
         @locked_pages = Page.from_current_site.all_locked
         @online_users = User.logged_in.to_a - [current_user]
         @first_time = current_user.sign_in_count == 1 && current_user.last_sign_in_at.nil?

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

@@ -26,7 +26,7 @@ module Alchemy
       def new
         @page = Page.find_by_id(params[:page_id])
         @element = @page.elements.build
-        @elements = Element.all_for_page(@page)
+        @elements = @page.available_element_definitions
         clipboard_elements = get_clipboard[:elements]
         unless clipboard_elements.blank?
           @clipboard_items = Element.all_from_clipboard_for_page(clipboard_elements, @page)

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

@@ -19,7 +19,7 @@ module Alchemy
         @content = Content.find_by_id(params[:id])
         @attachment = Attachment.find_by_id(params[:attachment_id])
         @content.essence.attachment = @attachment
-        @options = params[:options] || {}
+        @options = options_from_params
       end
 
     end

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

@@ -1,92 +1,106 @@
 module Alchemy
   module Admin
     class EssencePicturesController < Alchemy::Admin::BaseController
+      before_filter :load_essence_picture, only: [:edit, :crop, :update]
+      before_filter :load_content, only: [:edit, :update, :assign]
+      before_filter :load_options
 
       helper "alchemy/admin/contents"
       helper "alchemy/admin/essences"
       helper "alchemy/url"
 
       def edit
-        @essence_picture = EssencePicture.find(params[:id])
-        @content = Content.find(params[:content_id])
-        @options = params[:options] || {}
         render layout: !request.xhr?
       end
 
       def crop
-        @essence_picture = EssencePicture.find(params[:id])
-        if @essence_picture.picture
+        if @picture = @essence_picture.picture
           @content = @essence_picture.content
-          @options = params[:options] || {}
           @options[:format] ||= (configuration(:image_store_format) or 'png')
-          if @essence_picture.render_size.blank?
-            if @options[:image_size].blank?
-              @size_x, @size_y = 0, 0
-            else
-              @size_x, @size_y = @options[:image_size].split('x')[0], @options[:image_size].split('x')[1]
-            end
-          else
-            @size_x, @size_y = @essence_picture.render_size.split('x')[0], @essence_picture.render_size.split('x')[1]
-          end
-          if @essence_picture.crop_from.blank? && @essence_picture.crop_size.blank?
-            @initial_box = @essence_picture.picture.default_mask("#{@size_x}x#{@size_y}")
-            @default_box = @initial_box
-          else
-            @initial_box = {
-              :x1 => @essence_picture.crop_from.split('x')[0].to_i,
-              :y1 => @essence_picture.crop_from.split('x')[1].to_i,
-              :x2 => @essence_picture.crop_from.split('x')[0].to_i + @essence_picture.crop_size.split('x')[0].to_i,
-              :y2 => @essence_picture.crop_from.split('x')[1].to_i + @essence_picture.crop_size.split('x')[1].to_i
-            }
-            @default_box = @essence_picture.picture.default_mask("#{@size_x}x#{@size_y}")
-          end
-          @ratio = @options[:fixed_ratio] == 'false' ? false : (@size_x.to_f / @size_y.to_f)
+          @size_x, @size_y = sizes_from_essence_or_params
+          @initial_box, @default_box = cropping_boxes
+          @ratio = ratio_from_size_or_params
         else
-          @no_image_notice = _t('No image found. Did you saved the element?')
+          @no_image_notice = _t(:no_image_for_cropper_found)
         end
         render layout: !request.xhr?
       end
 
       def update
-        @essence_picture = EssencePicture.find(params[:id])
         @essence_picture.update_attributes(params[:essence_picture])
-        @content = Content.find(params[:content_id])
-        @options = params[:options] || {}
       end
 
+      # Assigns picture, but does not saves it.
+      #
+      # When the user press save on the element, it gets saved.
+      #
       def assign
-        @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
         @dragable = @options[:grouped]
-        # If options params come from Flash uploader then we have to parse them as hash.
-        if @options.is_a?(String)
-          @options = Rack::Utils.parse_query(@options)
-        end
-        @options = @options.merge(
-          :dragable => @dragable
-        )
-      end
-
-      def save_link
-        @content = Content.find(params[:id])
-        @picture_essence = @content.essence
-        @picture_essence.link = params[:link]
-        @picture_essence.link_title = params[:title]
-        @picture_essence.open_link_in_new_window = params[:blank]
-        @notice = _t(:saved_link)
-        @picture_essence.save
+        @options = @options.merge(dragable: @dragable)
       end
 
       def destroy
-        content = Content.find_by_id(params[:id])
-        @element = content.element
-        @content_id = content.id
-        content.destroy
+        @content = Content.find_by_id(params[:id])
+        @element = @content.element
+        @content_id = @content.id
+        @content.destroy
         @essence_pictures = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
-        @options = params[:options]
+      end
+
+    private
+
+      def load_options
+        @options = options_from_params
+      end
+
+      def load_essence_picture
+        @essence_picture = EssencePicture.find(params[:id])
+      end
+
+      def load_content
+        @content = Content.find(params[:content_id])
+      end
+
+      def sizes_from_essence_or_params
+        sizes_from_essence || sizes_from_params
+      end
+
+      def sizes_from_params
+        return [0, 0] if @options[:image_size].blank?
+        @options[:image_size].split('x')
+      end
+
+      def sizes_from_essence
+        return if @essence_picture.render_size.blank?
+        @essence_picture.render_size.split('x')
+      end
+
+      def sizes_string
+        @sizes_string ||= "#{@size_x}x#{@size_y}"
+      end
+
+      def cropping_boxes
+        if @essence_picture.crop_from.blank? || @essence_picture.crop_size.blank?
+          initial_box = @picture.default_mask(sizes_string)
+          default_box = initial_box
+        else
+          initial_box = @essence_picture.cropping_mask
+          default_box = @picture.default_mask(sizes_string)
+        end
+        [initial_box, default_box]
+      end
+
+      def ratio_from_size_or_params
+        if @options[:fixed_ratio] == false
+          false
+        elsif @size_y == 0
+          1
+        else
+          @size_x.to_f / @size_y.to_f
+        end
       end
 
     end

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

@@ -1,13 +1,13 @@
 module Alchemy
   module Admin
     class PagesController < Alchemy::Admin::BaseController
-      include Alchemy::FerretSearch
+      include Ferret::Search
 
       helper "alchemy/pages"
 
       before_filter :set_translation, :except => [:show]
 
-      filter_access_to [:show, :unlock, :visit, :publish, :configure, :edit, :update, :destroy, :fold], :attribute_check => true, :load_method => :load_page, :model => Alchemy::Page
+      filter_access_to [:show, :info, :unlock, :visit, :publish, :configure, :edit, :update, :destroy, :fold], :attribute_check => true, :load_method => :load_page, :model => Alchemy::Page
       filter_access_to [:index, :link, :layoutpages, :new, :switch_language, :create, :move, :flush], :attribute_check => false
 
       cache_sweeper Alchemy::PagesSweeper, :only => [:publish], :if => proc { Alchemy::Config.get(:cache_pages) }
@@ -41,6 +41,10 @@ module Alchemy
         render :file => Rails.root.join('public', '500.html'), :status => 500, :layout => false
       end
 
+      def info
+        render layout: !request.xhr?
+      end
+
       def new
         @page = Page.new(:layoutpage => params[:layoutpage] == 'true', :parent_id => params[:parent_id])
         @page_layouts = PageLayout.layouts_for_select(session[:language_id], @page.layoutpage?)
@@ -49,24 +53,13 @@ module Alchemy
       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
-        # 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],
-            :language => parent.language,
-            :name => params[:page][:name],
-            :title => params[:page][:name]
-          })
-          if source_page.children.any?
-            source_page.copy_children_to(@page)
-          end
+        if params[:paste_from_clipboard]
+          source = Page.find(params[:paste_from_clipboard])
+          parent = Page.find_by_id(params[:page][:parent_id]) || Page.root
+          @page = Page.paste_from_clipboard(source, parent, params[:page][:name])
         else
-          # Create new page
           @page = Page.new(params[:page])
+          @page.set_language_from_parent_or_default_language
         end
         if @page.save
           redirect_path = params[:redirect_to] || edit_admin_page_path(@page)
@@ -81,10 +74,10 @@ 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)
           redirect_to admin_pages_path
         else
-          @page.lock(current_user)
+          @page.lock!(current_user)
           @locked_pages = Page.from_current_site.all_locked_by(current_user)
         end
         @layoutpage = @page.layoutpage?
@@ -151,8 +144,7 @@ module Alchemy
 
       def fold
         # @page is fetched via before filter
-        @page.fold(current_user.id, !@page.folded?(current_user.id))
-        @page.save
+        @page.fold!(current_user.id, !@page.folded?(current_user.id))
         respond_to do |format|
           format.js
         end
@@ -161,7 +153,7 @@ module Alchemy
       # Leaves the page editing mode and unlocks the page for other users
       def unlock
         # fetching page via before filter
-        @page.unlock
+        @page.unlock!
         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|
@@ -173,7 +165,7 @@ module Alchemy
       end
 
       def visit
-        @page.unlock
+        @page.unlock!
         redirect_to show_page_path(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
       end
 
@@ -208,19 +200,17 @@ module Alchemy
         @sorting = true
       end
 
-      # Receives a JSON object representing a language tree to be ordered
-      # and updates all pages in that language structure to their correct indexes
       def order
-        neworder = JSON.parse(params[:set])
-        rootpage = Page.language_root_for(session[:language_id])
-
-        tree = create_tree(neworder, rootpage)
+        @page_root = Page.language_root_for(session[:language_id])
 
-        Alchemy::Page.transaction do
-          tree.each do |key, node|
-            dbitem = Page.find(key)
-            dbitem.update_node!(node)
-          end
+        # Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
+        neworder = JSON.parse(params[:set])
+        prev_item = nil
+        neworder.each do |item|
+          dbitem = Page.find(item['id'])
+          prev_item.nil? ? dbitem.move_to_child_of(@page_root) : dbitem.move_to_right_of(prev_item)
+          sort_children(item, dbitem) unless item['children'].nil?
+          prev_item = dbitem.reload
         end
 
         flash[:notice] = _t("Pages order saved")
@@ -250,85 +240,6 @@ module Alchemy
 
     private
 
-      # Returns the current left index and the aggregated hash of tree nodes indexed by page id visited so far
-      #
-      # Visits a batch of children nodes, assigns them the correct ordering indexes and spuns recursively the same
-      # procedure on their children, if any
-      #
-      # @param [Array]
-      #   An array of children nodes to be visited
-      # @param [Integer]
-      #   The lft attribute that should be given to the first node in the array
-      # @param [Integer]
-      #   The page id of the parent of this batch of children nodes
-      # @param [Integer]
-      #   The depth at which these children reside
-      # @param [Hash]
-      #   A Hash of TreeNode's indexed by their page ids
-      # @param [String]
-      #   The url for the parent node of these children
-      # @param [Boolean]
-      #   Whether these children reside in a restricted branch according to their ancestors
-      #
-      def visit_nodes(nodes, my_left, parent, depth, tree, url, restricted)
-        nodes.each do |item|
-          my_right = my_left + 1
-          my_restricted = item['restricted'] || restricted
-          urls = process_url(url, item)
-
-          if item['children']
-            my_right, tree = visit_nodes(item['children'], my_left + 1, item['id'], depth + 1, tree, urls[:children_path], my_restricted)
-          end
-
-          tree[item['id']] = TreeNode.new(my_left, my_right, parent, depth, urls[:my_urlname], my_restricted)
-          my_left = my_right + 1
-        end
-
-        [my_left, tree]
-      end
-
-      # Returns a Hash of TreeNode's indexed by their page ids
-      #
-      # Grabs the array representing a tree structure of pages passed as a parameter,
-      # visits it and creates a map of TreeNodes indexed by page id featuring Nested Set
-      # ordering information consisting of the left, right, depth and parent_id indexes as
-      # well as a node's url and restricted status
-      #
-      # @param [Array]
-      #   An Array representing a tree of Alchemy::Page's
-      # @param [Alchemy::Page]
-      #   The root page for the language being ordered
-      #
-      def create_tree(items, rootpage)
-        _, tree = visit_nodes(items, rootpage.lft + 1, rootpage.id, rootpage.depth + 1, {}, "", rootpage.restricted)
-        tree
-      end
-
-      # Returns a pair, the path that a given tree node should take, and the path its children should take
-      #
-      # This function will add a node's own slug into their ancestor's path
-      # in order to create the full URL of a node
-      #
-      # NOTE: external and invisible pages are not part of the full path of their children
-      #
-      # @param [String]
-      #   The node's ancestors path
-      # @param [Hash]
-      #   A children node
-      #
-      def process_url(ancestors_path, item)
-        default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item['slug']
-
-        pair = {my_urlname: default_urlname, children_path: default_urlname}
-
-        if item['external'] == true || item['visible'] == false
-          # children ignore an ancestor in their path if external or invisible
-          pair[:children_path] = ancestors_path
-        end
-
-        pair
-      end
-
       def load_page
         @page = Page.find(params[:id])
       end
@@ -336,6 +247,18 @@ module Alchemy
       def pages_from_raw_request
         request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
       end
+
+      # Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
+      def sort_children(element, dbitem)
+        prevchild = nil
+        element['children'].each do |child|
+          childitem = Page.find(child['id'])
+          prevchild.nil? ? childitem.move_to_child_of(dbitem) : childitem.move_to_right_of(prevchild)
+          sort_children(child, childitem) unless child['children'].nil?
+          prevchild = childitem
+        end
+      end
+
     end
   end
 end