alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,115 +1,115 @@
 module Alchemy
-	module Admin
-		class AttachmentsController < Alchemy::Admin::BaseController
+  module Admin
+    class AttachmentsController < Alchemy::Admin::BaseController
 
-			protect_from_forgery :except => [:create]
+      protect_from_forgery :except => [:create]
 
-			def index
-				if in_overlay?
-					archive_overlay
-				else
-					@attachments = Attachment.find_paginated(params, per_page_value_for_screen_size)
-				end
-			end
+      def index
+        if in_overlay?
+          archive_overlay
+        else
+          @attachments = Attachment.find_paginated(params, per_page_value_for_screen_size)
+        end
+      end
 
-			def new
-				@attachment = Attachment.new
-				if in_overlay?
-					@while_assigning = true
-					@content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
-					@swap = params[:swap]
-					@options = hashified_options
-				end
-				render :layout => false
-			end
+      def new
+        @attachment = Attachment.new
+        if in_overlay?
+          @while_assigning = true
+          @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
+          @swap = params[:swap]
+          @options = hashified_options
+        end
+        render :layout => !request.xhr?
+      end
 
-			def create
-				@attachment = Attachment.new(:uploaded_data => params[:Filedata])
-				@attachment.name = @attachment.filename
-				@attachment.save
-				if in_overlay?
-					@while_assigning = true
-					@content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
-					@swap = params[:swap]
-					@options = hashified_options
-				end
-				@attachments = Attachment.find_paginated(params, per_page_value_for_screen_size)
-				@message = t('File %{name} uploaded succesfully', :name => @attachment.name)
-				# Are we using the Flash uploader? Or the plain html file uploader?
-				if params[Rails.application.config.session_options[:key]].blank?
-					flash[:notice] = @message
-					redirect_to :action => :index
-				end
-			end
+      def create
+        @attachment = Attachment.new(:uploaded_data => params[:Filedata])
+        @attachment.name = @attachment.filename
+        @attachment.save
+        if in_overlay?
+          @while_assigning = true
+          @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
+          @swap = params[:swap]
+          @options = hashified_options
+        end
+        @attachments = Attachment.find_paginated(params, per_page_value_for_screen_size)
+        @message = t('File %{name} uploaded succesfully', :name => @attachment.name)
+        # Are we using the Flash uploader? Or the plain html file uploader?
+        if params[Rails.application.config.session_options[:key]].blank?
+          flash[:notice] = @message
+          redirect_to :action => :index
+        end
+      end
 
-			def edit
-				@attachment = Attachment.find(params[:id])
-				render :layout => false
-			end
+      def edit
+        @attachment = Attachment.find(params[:id])
+        render :layout => false
+      end
 
-			def update
-				@attachment = Attachment.find(params[:id])
-				oldname = @attachment.name
-				if @attachment.update_attributes(params[:attachment], :as => current_user.role.to_sym)
-					flash[:notice] = t("File renamed successfully from: '%{from}' to '%{to}'", :from => oldname, :to => @attachment.name)
-				else
-					render :action => "edit"
-				end
-				redirect_to admin_attachments_path(:page => params[:page], :query => params[:query], :per_page => params[:per_page])
-			end
+      def update
+        @attachment = Attachment.find(params[:id])
+        oldname = @attachment.name
+        if @attachment.update_attributes(params[:attachment], :as => current_user.role.to_sym)
+          flash[:notice] = t("File renamed successfully from: '%{from}' to '%{to}'", :from => oldname, :to => @attachment.name)
+        else
+          render :action => "edit"
+        end
+        redirect_to admin_attachments_path(:page => params[:page], :query => params[:query], :per_page => params[:per_page])
+      end
 
-			def destroy
-				@attachment = Attachment.find(params[:id])
-				name = @attachment.name
-				@attachment.destroy
-				flash[:notice] = t("File: '%{name}' deleted successfully", :name => name)
-			end
+      def destroy
+        @attachment = Attachment.find(params[:id])
+        name = @attachment.name
+        @attachment.destroy
+        flash[:notice] = t("File: '%{name}' deleted successfully", :name => name)
+      end
 
-			def show
-				@attachment = Attachment.find(params[:id])
-				send_file(
-					@attachment.public_filename,
-					{
-						:name => @attachment.filename,
-						:type => @attachment.content_type,
-						:disposition => 'inline'
-					}
-				)
-			end
+      def show
+        @attachment = Attachment.find(params[:id])
+        send_file(
+          @attachment.public_filename,
+          {
+            :name => @attachment.filename,
+            :type => @attachment.content_type,
+            :disposition => 'inline'
+          }
+        )
+      end
 
-			def download
-				@attachment = Attachment.find(params[:id])
-				send_file(
-					@attachment.full_filename, {
-						:name => @attachment.filename,
-						:type => @attachment.content_type,
-						:disposition => 'attachment'
-					}
-				)
-			end
+      def download
+        @attachment = Attachment.find(params[:id])
+        send_file(
+          @attachment.full_filename, {
+            :name => @attachment.filename,
+            :type => @attachment.content_type,
+            :disposition => 'attachment'
+          }
+        )
+      end
 
-		private
+      private
 
-			def in_overlay?
-				!params[:content_id].blank?
-			end
+      def in_overlay?
+        !params[:content_id].blank?
+      end
 
-			def archive_overlay
-				@content = Content.find(params[:content_id])
-				@options = params[:options]
-				if !params[:only].blank?
-					condition = "filename LIKE '%.#{params[:only].join("' OR filename LIKE '%.")}'"
-				elsif !params[:except].blank?
-					condition = "filename NOT LIKE '%.#{params[:except].join("' OR filename NOT LIKE '%.")}'"
-				else
-					condition = ""
-				end
-				@attachments = Attachment.where(condition).order(:name)
-				respond_to do |format|
-					format.html { render :partial => 'archive_overlay' }
-				end
-			end
+      def archive_overlay
+        @content = Content.find(params[:content_id])
+        @options = params[:options]
+        if !params[:only].blank?
+          condition = "filename LIKE '%.#{params[:only].join("' OR filename LIKE '%.")}'"
+        elsif !params[:except].blank?
+          condition = "filename NOT LIKE '%.#{params[:except].join("' OR filename NOT LIKE '%.")}'"
+        else
+          condition = ""
+        end
+        @attachments = Attachment.where(condition).order(:name)
+        respond_to do |format|
+          format.html { render :partial => 'archive_overlay' }
+        end
+      end
 
-		end
-	end
+    end
+  end
 end

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

@@ -1,118 +1,118 @@
 module Alchemy
-	module Admin
-		class BaseController < Alchemy::BaseController
-
-			include Userstamp
-
-			before_filter :set_translation
-
-			helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
-
-			filter_access_to :all
-
-			rescue_from Exception, :with => :exception_handler
-
-			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
-
-			# Handles exceptions
-			def exception_handler(e)
-				exception_logger(e)
-				show_error_notice(e)
-			end
-
-			# Logs the current exception to the error log.
-			def exception_logger(e)
-				message = "\n+++++++++ Error: #{e} +++++++++++++\n\n"
-				e.backtrace.each do |line|
-					message += "#{line}\n"
-				end
-				logger.error(message)
-			end
-
-			# Displays an error notice in the Alchemy backend.
-			def show_error_notice(e)
-				@notice = "Error: #{e}"
-				@trace = e.backtrace
-				if request.xhr?
-					render :action => "error_notice", :layout => false
-				else
-					flash.now[:error] = @notice
-					render '500', :status => 500
-				end
-			end
-
-			def redirect_back_or_to_default(default_path = admin_dashboard_path)
-				if request.env["HTTP_REFERER"].blank?
-					redirect_to default_path
-				else
-					redirect_to :back
-				end
-			end
-
-			def get_clipboard(category = nil)
-				clipboard = (session[:clipboard] ||= {})
-				clipboard[category.to_s.pluralize] ||= [] if category
-			end
-
-			def clipboard_empty?(category = nil)
-				return true if session[:clipboard].blank?
-				if category
-					session[:clipboard][category.pluralize].blank?
-				else
-					false
-				end
-			end
-
-			def trash_empty?(category)
-				"alchemy/#{category.singularize}".classify.constantize.trashed.blank?
-			end
-
-			def set_stamper
-				User.stamper = self.current_user
-			end
-
-			def reset_stamper
-				User.reset_stamper
-			end
-
-			# Returns true if the current_user (The logged-in Alchemy User) has the admin role.
-			def is_admin?
-				return false if !current_user
-				current_user.admin?
-			end
-
-			def render_errors_or_redirect(object, redirect_url, flash_notice, button = nil)
-				if object.errors.empty?
-					@redirect_url = redirect_url
-					flash[:notice] = t(flash_notice)
-					render :action => :redirect
-				else
-					render_remote_errors(object, button)
-				end
-			end
-
-			def render_remote_errors(object, button = nil)
-				@button = button
-				@errors = ("<ul>" + object.errors.full_messages.map { |e| "<li>#{e}</li>" }.join + "</ul>").html_safe
-				render :action => :remote_errors
-			end
-
-			def per_page_value_for_screen_size
-				return 25 if session[:screen_size].blank?
-				screen_height = session[:screen_size].split('x').last.to_i
-				(screen_height / 30) - 12
-			end
-
-		end
-	end
+  module Admin
+    class BaseController < Alchemy::BaseController
+
+      include Userstamp
+
+      before_filter :set_translation
+
+      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
+
+      filter_access_to :all
+
+      rescue_from Exception, :with => :exception_handler
+
+      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
+
+      # Handles exceptions
+      def exception_handler(e)
+        exception_logger(e)
+        show_error_notice(e)
+      end
+
+      # Logs the current exception to the error log.
+      def exception_logger(e)
+        message = "\n+++++++++ Error: #{e} +++++++++++++\n\n"
+        e.backtrace.each do |line|
+          message += "#{line}\n"
+        end
+        logger.error(message)
+      end
+
+      # Displays an error notice in the Alchemy backend.
+      def show_error_notice(e)
+        @notice = "Error: #{e}"
+        @trace = e.backtrace
+        if request.xhr?
+          render :action => "error_notice", :layout => false
+        else
+          flash.now[:error] = @notice
+          render '500', :status => 500
+        end
+      end
+
+      def redirect_back_or_to_default(default_path = admin_dashboard_path)
+        if request.env["HTTP_REFERER"].blank?
+          redirect_to default_path
+        else
+          redirect_to :back
+        end
+      end
+
+      def get_clipboard(category = nil)
+        clipboard = (session[:clipboard] ||= {})
+        clipboard[category.to_s.pluralize] ||= [] if category
+      end
+
+      def clipboard_empty?(category = nil)
+        return true if session[:clipboard].blank?
+        if category
+          session[:clipboard][category.pluralize].blank?
+        else
+          false
+        end
+      end
+
+      def trash_empty?(category)
+        "alchemy/#{category.singularize}".classify.constantize.trashed.blank?
+      end
+
+      def set_stamper
+        User.stamper = self.current_user
+      end
+
+      def reset_stamper
+        User.reset_stamper
+      end
+
+      # Returns true if the current_user (The logged-in Alchemy User) has the admin role.
+      def is_admin?
+        return false if !current_user
+        current_user.admin?
+      end
+
+      def render_errors_or_redirect(object, redirect_url, flash_notice, button = nil)
+        if object.errors.empty?
+          @redirect_url = redirect_url
+          flash[:notice] = t(flash_notice)
+          render :action => :redirect
+        else
+          render_remote_errors(object, button)
+        end
+      end
+
+      def render_remote_errors(object, button = nil)
+        @button = button
+        @errors = ("<ul>" + object.errors.full_messages.map { |e| "<li>#{e}</li>" }.join + "</ul>").html_safe
+        render :action => :remote_errors
+      end
+
+      def per_page_value_for_screen_size
+        return 25 if session[:screen_size].blank?
+        screen_height = session[:screen_size].split('x').last.to_i
+        (screen_height / 30) - 12
+      end
+
+    end
+  end
 end

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

@@ -1,46 +1,46 @@
 module Alchemy
-	module Admin
-
-		class ClipboardController < Alchemy::Admin::BaseController
-
-			def index
-				clipboard = get_clipboard(params[:remarkable_type])
-				@clipboard_items = model_class.all_from_clipboard(clipboard)
-				respond_to do |format|
-					format.html { render :layout => false }
-				end
-			end
-
-			def insert
-				@clipboard = get_clipboard(params[:remarkable_type])
-				@item = model_class.find(params[:remarkable_id])
-				unless @clipboard.collect { |i| i[:id].to_i }.include?(params[:remarkable_id].to_i)
-					@clipboard.push({:id => params[:remarkable_id].to_i, :action => params[:remove] ? 'cut' : 'copy'})
-				end
-				respond_to do |format|
-					format.js
-				end
-			end
-
-			def remove
-				@clipboard = get_clipboard(params[:remarkable_type])
-				@item = model_class.find(params[:remarkable_id])
-				@clipboard.delete_if { |i| i[:id].to_i == params[:remarkable_id].to_i }
-				respond_to do |format|
-					format.js
-				end
-			end
-
-			def clear
-				session[:clipboard] = {}
-			end
-
-		private
-
-			def model_class
-				"alchemy/#{params[:remarkable_type]}".classify.constantize
-			end
-
-		end
-	end
+  module Admin
+
+    class ClipboardController < Alchemy::Admin::BaseController
+
+      def index
+        clipboard = get_clipboard(params[:remarkable_type])
+        @clipboard_items = model_class.all_from_clipboard(clipboard)
+        respond_to do |format|
+          format.html { render :layout => false }
+        end
+      end
+
+      def insert
+        @clipboard = get_clipboard(params[:remarkable_type])
+        @item = model_class.find(params[:remarkable_id])
+        unless @clipboard.collect { |i| i[:id].to_s }.include?(params[:remarkable_id])
+          @clipboard.push({:id => params[:remarkable_id], :action => params[:remove] ? 'cut' : 'copy'})
+        end
+        respond_to do |format|
+          format.js
+        end
+      end
+
+      def remove
+        @clipboard = get_clipboard(params[:remarkable_type])
+        @item = model_class.find(params[:remarkable_id])
+        @clipboard.delete_if { |i| i[:id].to_s == params[:remarkable_id] }
+        respond_to do |format|
+          format.js
+        end
+      end
+
+      def clear
+        session[:clipboard] = {}
+      end
+
+      private
+
+      def model_class
+        "alchemy/#{params[:remarkable_type]}".classify.constantize
+      end
+
+    end
+  end
 end