alchemy_cms 2.2.4 → 2.3.rc5

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

@@ -14,15 +14,7 @@ module Alchemy
 
       layout 'alchemy/admin'
 
-      private
-
-      # Setting the Alchemy GUI translation to users preffered language, or taking default translation.
-      # You can set the default translation in your +config/application.rb+ file
-      def set_translation
-        if current_user && current_user.language
-          ::I18n.locale = current_user.language
-        end
-      end
+    private
 
       # Handles exceptions
       def exception_handler(e)

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

@@ -15,13 +15,13 @@ module Alchemy
         @options = params[:options] || {}
         @html_options = params[:html_options] || {}
         if @options.is_a?(String)
-          @options = JSON.parse(@options)
+          @options = @options.present? ? JSON.parse(@options) : {}
         end
         if @content.essence_type == "Alchemy::EssencePicture"
-          @content_dom_id = "#add_content_#{@element.id}"
+          @content_dom_id = "#add_picture_#{@element.id}"
           @content.essence.picture_id = params[:picture_id]
           @content.essence.save
-          @contents_of_this_type = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
+          @contents_of_this_type = @element.contents.gallery_pictures
           @dragable = @contents_of_this_type.length > 1
           @options = @options.merge(:dragable => @dragable)
         else
@@ -50,9 +50,7 @@ module Alchemy
       def destroy
         @content = Content.find(params[:id])
         @content_dup = @content.clone
-        element = @content.element
-        content_name = @content.name
-        @notice = t("Successfully deleted content", :content => content_name)
+        @notice = t("Successfully deleted content", :content => @content.name_for_label)
         @content.destroy
       end
 

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

@@ -37,6 +37,7 @@ module Alchemy
       # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
       def create
         @page = Page.find(params[:element][:page_id])
+        @element_name = params[:element][:name] # storing the original element name, because the model alters the params hash
         @paste_from_clipboard = !params[:paste_from_clipboard].blank?
         if @paste_from_clipboard
           source_element = Element.find(element_from_clipboard[:id])
@@ -50,7 +51,6 @@ module Alchemy
           @element = Element.new_from_scratch(params[:element])
         end
         put_element_in_cell if @page.can_have_cells?
-        @element.page = @page
         if @element.save
           render :action => :create
         else
@@ -103,7 +103,7 @@ module Alchemy
     private
 
       def put_element_in_cell
-        element_with_cell_name = @paste_from_clipboard ? params[:paste_from_clipboard] : params[:element][:name]
+        element_with_cell_name = @paste_from_clipboard ? params[:paste_from_clipboard] : @element_name
         cell_definition = Cell.definition_for(element_with_cell_name.split('#').last) if !element_with_cell_name.blank?
         if cell_definition
           @cell = @page.cells.find_or_create_by_name(cell_definition['name'])

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

@@ -101,7 +101,6 @@ module Alchemy
         name = @page.name
         @page_id = @page.id
         @layoutpage = @page.layoutpage?
-        session[:language_id] = @page.language_id
         if @page.destroy
           @page_root = Page.language_root_for(session[:language_id])
           @message = t("Page deleted", :name => name)
@@ -109,6 +108,8 @@ module Alchemy
           respond_to do |format|
             format.js
           end
+          # remove from clipboard
+          get_clipboard.remove(:pages, @page_id)
         end
       end
 
@@ -121,7 +122,6 @@ module Alchemy
         end
         @area_name = params[:area_name]
         @content_id = params[:content_id]
-        @link_target_options = Page.link_target_options
         @attachments = Attachment.all.collect { |f| [f.name, download_attachment_path(:id => f.id, :name => f.name)] }
         if params[:link_urls_for] == "newsletter"
           # TODO: links in newsletters has to go through statistic controller. therfore we have to put a string inside the content_rtfs and replace this string with recipient.id before sending the newsletter.

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

@@ -8,8 +8,16 @@ module Alchemy
       respond_to :html, :js
 
       def index
-        @size = params[:size] || 'medium'
-        @pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
+        @size = params[:size].present? ? params[:size] : 'medium'
+        @pictures = Picture.scoped
+        @pictures = @pictures.tagged_with(params[:tagged_with], :any => true) if params[:tagged_with].present?
+        case params[:filter]
+          when 'recent'
+            @pictures = @pictures.recent
+          when 'last_upload'
+            @pictures = @pictures.last_upload
+        end
+        @pictures = @pictures.find_paginated(params, pictures_per_page_for_size(@size))
         if in_overlay?
           archive_overlay
         else
@@ -23,7 +31,7 @@ module Alchemy
         @size = params[:size] || 'medium'
         if in_overlay?
           @while_assigning = true
-          @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
+          @content = Content.find_by_id(params[:content_id], :select => 'id')
           @element = Element.find(params[:element_id], :select => 'id')
           @options = hashified_options
           @page = params[:page]
@@ -33,7 +41,10 @@ module Alchemy
       end
 
       def create
-        @picture = Picture.new(:image_file => params[:Filedata])
+        @picture = Picture.new(
+          :image_file => params[:Filedata],
+          :upload_hash => params[:upload_hash]
+        )
         @picture.name = @picture.humanized_name
         @picture.save
         @size = params[:size] || 'medium'
@@ -52,17 +63,55 @@ module Alchemy
           flash[:notice] = @message
           #redirect_to :back
           #TODO temporary workaround; has to be fixed.
-          redirect_to admin_pictures_path
+          redirect_to admin_pictures_path(:filter => 'last_upload')
         end
       end
 
+      def edit
+        @picture = Picture.find(params[:id])
+        render :layout => !request.xhr?
+      end
+
+      def edit_multiple
+        @pictures = Picture.find(params[:picture_ids])
+        render :layout => !request.xhr?
+      end
+
       def update
-        @size = params[:size] || 'medium'
         @picture = Picture.find(params[:id])
-        oldname = @picture.name
-        @picture.name = params[:name]
-        @picture.save
-        @message = t("Picture renamed successfully", :from => oldname, :to => @picture.name)
+
+        if @picture.update_attributes(params[:picture])
+          flash[:notice] = t('picture_updated_successfully', :name => @picture.name)
+        else
+          flash[:error] = t('picture_update_failed')
+        end
+        redirect_to_index
+      end
+
+      def update_multiple
+        @pictures = Picture.find(params[:picture_ids])
+        @pictures.each do |picture|
+          # Do not delete name from multiple pictures, if the form field is blank!
+          picture.name = params[:pictures_name] if params[:pictures_name].present?
+          picture.tag_list = params[:pictures_tag_list]
+          picture.save
+        end
+        flash[:notice] = t("Pictures updated successfully")
+        redirect_to_index
+      end
+
+      def delete_multiple
+        if request.delete? && params[:picture_ids].present?
+          pictures = Picture.find(params[:picture_ids])
+          names = pictures.map(&:name).to_sentence
+          pictures.each do |picture|
+            picture.destroy
+          end
+          flash[:notice] = t("Pictures deleted successfully", :names => names)
+        else
+          flash[:notice] = t("Could not delete Pictures")
+        end
+        redirect_to_index
       end
 
       def destroy
@@ -84,16 +133,16 @@ module Alchemy
         render :layout => false
       end
 
-      private
+    private
 
       def pictures_per_page_for_size(size)
         case size
         when 'small'
-          per_page = in_overlay? ? 35 : (per_page_value_for_screen_size * 2.9).floor # 50
+          per_page = in_overlay? ? 37 : (per_page_value_for_screen_size * 2.9).floor
         when 'large'
-          per_page = in_overlay? ? 4 : (per_page_value_for_screen_size / 1.7).floor # 8
+          per_page = in_overlay? ? 4 : (per_page_value_for_screen_size / 1.7).floor + 1
         else
-          per_page = in_overlay? ? 12 : (per_page_value_for_screen_size / 0.8).ceil # 18
+          per_page = in_overlay? ? 9 : (per_page_value_for_screen_size / 1.0).ceil + 1
         end
         return per_page
       end
@@ -111,11 +160,21 @@ module Alchemy
             render :partial => 'archive_overlay'
           }
           format.js {
-            render :action => :archive_overlay
+            render :action => 'archive_overlay'
           }
         end
       end
 
+      def redirect_to_index
+        redirect_to(
+          :action => :index,
+          :query => params[:query],
+          :tagged_with => params[:tagged_with],
+          :size => params[:size],
+          :filter => params[:filter]
+        )
+      end
+
     end
   end
 end

data/app/controllers/alchemy/attachments_controller.rb

@@ -1,9 +1,10 @@
 module Alchemy
   class AttachmentsController < Alchemy::BaseController
 
+    filter_access_to [:show, :download], :attribute_check => true, :model => Alchemy::Attachment, :load_method => :load_attachment
+
     # sends file inline. i.e. for viewing pdfs/movies in browser
     def show
-      @attachment = Attachment.find(params[:id])
       send_file(
         @attachment.public_filename,
         {
@@ -16,7 +17,6 @@ module Alchemy
 
     # sends file as attachment. aka download
     def download
-      @attachment = Attachment.find(params[:id])
       send_file(
         @attachment.full_filename, {
           :name => @attachment.filename,
@@ -26,5 +26,11 @@ module Alchemy
       )
     end
 
+  private
+
+    def load_attachment
+      @attachment = Attachment.find(params[:id])
+    end
+
   end
 end

data/app/controllers/alchemy/base_controller.rb

@@ -39,7 +39,29 @@ module Alchemy
       ::Alchemy::I18n.t(key, *args)
     end
 
-    private
+  private
+
+    # 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.
+    #
+    # You can set the default translation in your +config/application.rb+ file, via Rails +default_locale+ config option.
+    #
+    # If one passes a locale parameter the locale is set to its value
+    #
+    def set_translation
+      if params[:locale].blank? && session[:current_locale].present?
+        ::I18n.locale = session[:current_locale]
+      elsif params[:locale].present? && ::I18n.available_locales.include?(params[:locale].to_sym)
+        session[:current_locale] = ::I18n.locale = params[:locale]
+      elsif current_user && current_user.language.present?
+        ::I18n.locale = current_user.language
+      elsif Rails.env == 'test' # OMG I hate to do this. But it helps...
+        ::I18n.locale = 'en'
+      else
+        ::I18n.locale = request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /^[a-z]{2}/).try(:first)
+      end
+    end
 
     # Sets the language for rendering pages in pages controller
     def set_language
@@ -101,9 +123,29 @@ module Alchemy
       end
     end
 
+    # Handles the layout rendering
+    #
+    # Can be used inside the controller´s +layout+ class method
+    #
+    # === Example:
+    #   layout :layout_for_page
+    #
+    # === Usage:
+    # 1. You can pass none or false as url parameter to avoid any layout rendering.
+    # 2. You can pass a layout name of any existing layout file in +app/views/layouts+ folder.
+    #
+    # If no layout name is given, Alchemy tries to render +app/views/layouts/application/+ layout.
+    # If that is not present, Alchemy tries to render +app/views/layouts/alchemy/pages+ layout.
+    #
     def layout_for_page
-      if !params[:layout].blank? && params[:layout] != 'none'
-        params[:layout]
+      if params[:layout] == 'none' || params[:layout] == 'false'
+        false
+      elsif !params[:layout].blank?
+        if File.exist?(Rails.root.join('app/views/layouts', "#{params[:layout]}.html.erb"))
+          params[:layout]
+        else
+          raise_not_found_error
+        end
       elsif File.exist?(Rails.root.join('app/views/layouts', 'application.html.erb'))
         'application'
       else
@@ -116,10 +158,10 @@ module Alchemy
         logger.info "Rendering 404: #{exception.message}"
       end
       @page = Page.language_root_for(session[:language_id])
-      render :file => "#{Rails.root}/public/404", :status => 404, :layout => !@page.nil?
+      render :file => Rails.root.join("public/404.html"), :status => 404, :layout => !@page.nil?
     end
 
-    protected
+  protected
 
     def permission_denied
       if current_user

data/app/controllers/alchemy/elements_controller.rb

@@ -13,7 +13,7 @@ module Alchemy
       end
     end
 
-    private
+  private
 
     def load_element
       @element = Element.find(params[:id])

data/app/controllers/alchemy/messages_controller.rb

@@ -1,6 +1,6 @@
 # == Sending Messages:
 # To send Messages via contact forms you can create your form fields in the config.yml
-# 
+#
 # === Example:
 # Make an Element with this options inside your @elements.yml file:
 #
@@ -17,9 +17,9 @@
 #
 # The fields +mail_to+, +mail_from+, +subject+ and +success_page+ are recommended.
 # The +Alchemy::MessagesController+ uses them to send your mails. So your customer has full controll of these values inside his contactform element.
-# 
+#
 # Then make a page layout for your contact page in the +page_layouts.yml+ file:
-# 
+#
 #   - name: contact
 #     unique: true
 #     cache: false
@@ -29,12 +29,12 @@
 # Disabling the page caching is stronlgy recommended!
 #
 # The editor view for your element should have this layout:
-# 
+#
 #   <%= render_essence_editor_by_name(element, 'mail_from') %>
 #   <%= render_essence_editor_by_name(element, 'mail_to') %>
 #   <%= render_essence_editor_by_name(element, 'subject') %>
 #   <%= page_selector(element, 'success_page', :page_attribute => :urlname) %>
-# 
+#
 # Please have a look at the +alchemy/config/config.yml+ file for further Message settings.
 
 module Alchemy
@@ -76,26 +76,26 @@ module Alchemy
     def mail_to
       @element.ingredient("mail_to")
     rescue
-      mailer_config[:mail_to]
+      mailer_config['mail_to']
     end
 
     def mail_from
       @element.ingredient("mail_from")
     rescue
-      mailer_config[:mail_from]
+      mailer_config['mail_from']
     end
 
     def subject
       @element.ingredient("subject")
     rescue
-      mailer_config[:subject]
+      mailer_config['subject']
     end
 
     def redirect_to_success_page
       if @element.ingredient("success_page")
         urlname = @element.ingredient("success_page")
-      elsif mailer_config[:forward_to_page] && mailer_config[:mail_success_page]
-        urlname = Page.find_by_urlname(mailer_config[:mail_success_page]).urlname
+      elsif mailer_config['forward_to_page'] && mailer_config['mail_success_page']
+        urlname = Page.find_by_urlname(mailer_config['mail_success_page']).urlname
       else
         flash[:notice] = t(:success, :scope => 'contactform.messages')
         urlname = Page.language_root_for(session[:language_id]).urlname
@@ -104,8 +104,8 @@ module Alchemy
     end
 
     def get_page
-      @page = Page.find_by_page_layout_and_language_id(mailer_config[:page_layout_name], session[:language_id])
-      raise "Page for page_layout #{mailer_config[:page_layout_name]} not found" if @page.blank?
+      @page = Page.find_by_page_layout_and_language_id(mailer_config['page_layout_name'], session[:language_id])
+      raise "Page for page_layout #{mailer_config['page_layout_name']} not found" if @page.blank?
       @root_page = @page.get_language_root
     end
 

data/app/controllers/alchemy/pages_controller.rb

@@ -66,7 +66,11 @@ module Alchemy
           store_language_in_session(@page.language) if @page.present?
           return @page
         else
-          @page = Page.contentpages.find_by_urlname_and_language_id(params[:urlname], session[:language_id])
+          @page = Page.contentpages.where(
+            :urlname => params[:urlname],
+            :language_id => session[:language_id],  # Make sure that the current language
+            :language_code => params[:lang]         # matches the requested language code.
+          ).first
         end
       end
     end

data/app/controllers/alchemy/pictures_controller.rb

@@ -3,10 +3,12 @@ module Alchemy
 
     caches_page :show, :thumbnail, :zoom
 
+    before_filter :load_picture
+
+    filter_access_to :show, :attribute_check => true, :model => Alchemy::Picture, :load_method => :load_picture
     filter_access_to :thumbnail
 
     def show
-      @picture = Picture.find(params[:id])
       @size = params[:size]
       @crop = !params[:crop].nil?
       @crop_from = normalized_size(params[:crop_from])
@@ -22,7 +24,6 @@ module Alchemy
     end
 
     def thumbnail
-      @picture = Picture.find(params[:id])
       case params[:size]
       when "small"
         @size = "80x60"
@@ -43,10 +44,10 @@ module Alchemy
     end
 
     def zoom
-      @picture = Picture.find(params[:id])
+      #
     end
 
-    private
+  private
 
     def normalized_size(size)
       return "" if size.blank?
@@ -55,5 +56,9 @@ module Alchemy
       end.join('x')
     end
 
+    def load_picture
+      @picture ||= Picture.find(params[:id])
+    end
+
   end
 end