alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,121 +1,121 @@
 module Alchemy
-	module Admin
-		class PicturesController < Alchemy::Admin::BaseController
-			protect_from_forgery :except => [:create]
+  module Admin
+    class PicturesController < Alchemy::Admin::BaseController
+      protect_from_forgery :except => [:create]
 
-			cache_sweeper Alchemy::PicturesSweeper, :only => [:update, :destroy]
+      cache_sweeper Alchemy::PicturesSweeper, :only => [:update, :destroy]
 
-			respond_to :html, :js
+      respond_to :html, :js
 
-			def index
-				@size = params[:size] || 'medium'
-				@pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
-				if in_overlay?
-					archive_overlay
-				else
-					# render index.html.erb
-				end
-			end
+      def index
+        @size = params[:size] || 'medium'
+        @pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
+        if in_overlay?
+          archive_overlay
+        else
+          # render index.html.erb
+        end
+      end
 
-			def new
-				@picture = Picture.new
-				@while_assigning = params[:while_assigning] == 'true'
-				@size = params[:size] || 'medium'
-				if in_overlay?
-					@while_assigning = true
-					@content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
-					@element = Element.find(params[:element_id], :select => 'id')
-					@options = hashified_options
-					@page = params[:page]
-					@per_page = params[:per_page]
-				end
-				render :layout => false
-			end
+      def new
+        @picture = Picture.new
+        @while_assigning = params[:while_assigning] == 'true'
+        @size = params[:size] || 'medium'
+        if in_overlay?
+          @while_assigning = true
+          @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
+          @element = Element.find(params[:element_id], :select => 'id')
+          @options = hashified_options
+          @page = params[:page]
+          @per_page = params[:per_page]
+        end
+        render :layout => false
+      end
 
-			def create
-				@picture = Picture.new(:image_file => params[:Filedata])
-				@picture.name = @picture.humanized_name
-				@picture.save
-				@size = params[:size] || 'medium'
-				if in_overlay?
-					@while_assigning = true
-					@content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
-					@element = Element.find(params[:element_id], :select => 'id')
-					@options = hashified_options
-					@page = params[:page] || 1
-					@per_page = pictures_per_page_for_size(@size)
-				end
-				@pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
-				@message = t('Picture uploaded succesfully', :name => @picture.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 :back
-					#TODO temporary workaround; has to be fixed.
-					redirect_to admin_pictures_path
-				end
-			end
+      def create
+        @picture = Picture.new(:image_file => params[:Filedata])
+        @picture.name = @picture.humanized_name
+        @picture.save
+        @size = params[:size] || 'medium'
+        if in_overlay?
+          @while_assigning = true
+          @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
+          @element = Element.find(params[:element_id], :select => 'id')
+          @options = hashified_options
+          @page = params[:page] || 1
+          @per_page = pictures_per_page_for_size(@size)
+        end
+        @pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
+        @message = t('Picture uploaded succesfully', :name => @picture.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 :back
+          #TODO temporary workaround; has to be fixed.
+          redirect_to admin_pictures_path
+        end
+      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)
-			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)
+      end
 
-			def destroy
-				@picture = Picture.find(params[:id])
-				name = @picture.name
-				@picture.destroy
-				flash[:notice] = t("Picture deleted successfully", :name => name)
-				@redirect_url = admin_pictures_path(:per_page => params[:per_page], :page => params[:page], :query => params[:query])
-				render :action => :redirect
-			end
+      def destroy
+        @picture = Picture.find(params[:id])
+        name = @picture.name
+        @picture.destroy
+        flash[:notice] = t("Picture deleted successfully", :name => name)
+        @redirect_url = admin_pictures_path(:per_page => params[:per_page], :page => params[:page], :query => params[:query])
+        render :action => :redirect
+      end
 
-			def flush
-				FileUtils.rm_rf Rails.root.join('public', Alchemy.mount_point, 'pictures')
-				@notice = t('Picture cache flushed')
-			end
+      def flush
+        FileUtils.rm_rf Rails.root.join('public', Alchemy.mount_point, 'pictures')
+        @notice = t('Picture cache flushed')
+      end
 
-			def show_in_window
-				@picture = Picture.find(params[:id])
-				render :layout => false
-			end
+      def show_in_window
+        @picture = Picture.find(params[:id])
+        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
-				when 'large'
-					per_page = in_overlay? ? 4 : (per_page_value_for_screen_size / 1.7).floor # 8
-				else
-					per_page = in_overlay? ? 12 : (per_page_value_for_screen_size / 0.8).ceil # 18
-				end
-				return per_page
-			end
+      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
+        when 'large'
+          per_page = in_overlay? ? 4 : (per_page_value_for_screen_size / 1.7).floor # 8
+        else
+          per_page = in_overlay? ? 12 : (per_page_value_for_screen_size / 0.8).ceil # 18
+        end
+        return per_page
+      end
 
-			def in_overlay?
-				!params[:element_id].blank?
-			end
+      def in_overlay?
+        !params[:element_id].blank?
+      end
 
-			def archive_overlay
-				@content = Content.find_by_id(params[:content_id], :select => 'id')
-				@element = Element.find_by_id(params[:element_id], :select => 'id')
-				@options = hashified_options
-				respond_to do |format|
-					format.html {
-						render :partial => 'archive_overlay'
-					}
-					format.js {
-						render :action => :archive_overlay
-					}
-				end
-			end
+      def archive_overlay
+        @content = Content.find_by_id(params[:content_id], :select => 'id')
+        @element = Element.find_by_id(params[:element_id], :select => 'id')
+        @options = hashified_options
+        respond_to do |format|
+          format.html {
+            render :partial => 'archive_overlay'
+          }
+          format.js {
+            render :action => :archive_overlay
+          }
+        end
+      end
 
-		end
-	end
+    end
+  end
 end

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

@@ -1,168 +1,113 @@
 module Alchemy
-	module Admin
-		class ResourcesController < Alchemy::Admin::BaseController
-
-			rescue_from Exception, :with => :exception_handler
-
-			before_filter :load_resource, :only => [:show, :edit, :update, :destroy]
-
-			helper_method(
-				:resource_attributes,
-				:resource_window_size,
-				:resources_name,
-				:resource_model,
-				:resource_model_name,
-				:resource_instance_variable,
-				:resources_instance_variable,
-				:namespaced_resources_name,
-				:resource_namespaced?,
-				:resources_permission,
-				:resource_url_scope,
-				:is_alchemy_module?
-			)
-
-			def index
-				if !params[:query].blank?
-				    search_terms = ActiveRecord::Base.sanitize("%#{params[:query]}%")
-					items = resource_model.where(searchable_resource_attributes.map { |attribute|
-					  "`#{namespaced_resources_name}`.`#{attribute[:name]}` LIKE #{search_terms}"
-					}.join(" OR "))
-				else
-					items = resource_model
-				end
-				instance_variable_set("@#{resources_name}", items.page(params[:page] || 1).per(per_page_value_for_screen_size))
-			end
-
-			def new
-				instance_variable_set("@#{resource_model_name}", resource_model.new)
-				render :layout => !request.xhr?
-			end
-
-			def show
-				render :layout => !request.xhr?
-			end
-
-			def edit
-				render :layout => !request.xhr?
-			end
-
-			def create
-				instance_variable_set("@#{resource_model_name}", resource_model.new(params[resource_model_name.to_sym], :as => current_user.role.to_sym))
-				resource_instance_variable.save
-				render_errors_or_redirect(
-					resource_instance_variable,
-					resource_url_scope.url_for({:action => :index}),
-					flash_notice_for_resource_action
-				)
-			end
-
-			def update
-				resource_instance_variable.update_attributes(params[resource_model_name.to_sym], :as => current_user.role.to_sym)
-				render_errors_or_redirect(
-					resource_instance_variable,
-					resource_url_scope.url_for({:action => :index}),
-					flash_notice_for_resource_action
-				)
-			end
-
-			def destroy
-				resource_instance_variable.destroy
-				flash_notice_for_resource_action
-			end
-
-		protected
-			
-			# Returns a translated +flash[:notice]+.
-			# The key should look like "Modelname successfully created|updated|destroyed."
-			def flash_notice_for_resource_action(action = params[:action])
-				case action.to_sym
-				when :create
-					verb = "created"
-				when :update
-					verb = "updated"
-				when :destroy
-					verb = "removed"
-				end
-				flash[:notice] = t("#{resource_model_name.classify} successfully #{verb}", :default => t("Succesfully #{verb}"))
-			end
-
-			def load_resource
-				instance_variable_set("@#{resource_model_name}", resource_model.find(params[:id]))
-			end
-
-			def resources_name
-				@resources_name ||= params[:controller].split('/').last
-			end
-
-			def namespaced_resources_name
-				if resource_namespaced?
-					@namespaced_resources_name ||= "#{resource_namespace}_#{resources_name}".underscore
-				else
-					@namespaced_resources_name ||= resources_name
-				end
-			end
-
-			def resource_model_name
-				@resource_model_name ||= resources_name.singularize
-			end
-
-			def resource_model
-				@resource_model ||= (resource_namespace == "Admin" ? resource_model_name : "#{resource_namespace}/#{resource_model_name}").classify.constantize
-			end
-
-			def resource_attributes
-				@resource_attributes ||= resource_model.columns.collect do |col|
-					unless ["id", "updated_at", "created_at", "creator_id", "updater_id"].include?(col.name)
-						{:name => col.name, :type => col.type}
-					end
-				end.compact
-			end
-
-			def searchable_resource_attributes
-				resource_attributes.select{ |a| a[:type] == :string }
-			end
-
-			def resource_window_size
-				@resource_window_size ||= "400x#{100 + resource_attributes.length * 35}"
-			end
-
-			def resource_instance_variable
-				instance_variable_get("@#{resource_model_name}")
-			end
-
-			def resources_instance_variable
-				instance_variable_get("@#{resources_name}")
-			end
-
-			def resource_namespaced?
-				parts = params[:controller].split('/')
-				parts.length > 1 && parts.first != 'admin'
-			end
-
-			def resource_namespace
-				@resource_namespace ||= self.class.to_s.split("::").first
-			end
-
-			def resource_url_scope
-				if is_alchemy_module?
-					eval(alchemy_module['engine_name'])
-				else
-					main_app
-				end
-			end
-
-			def is_alchemy_module?
-				!alchemy_module.nil? && !alchemy_module['engine_name'].blank?
-			end
-
-			def alchemy_module
-				@alchemy_module ||= module_definition_for(:controller => params[:controller], :action => 'index')
-			end
-
-			def resources_permission
-				(resource_namespaced? ? "#{resource_namespace.underscore}_admin_#{resources_name}" : "admin_#{resources_name}").to_sym
-			end
-
-		end
-	end
+  module Admin
+    class ResourcesController < Alchemy::Admin::BaseController
+
+      include Alchemy::ResourcesHelper
+      helper Alchemy::ResourcesHelper
+      helper_method :resource_handler
+
+      rescue_from Exception, :with => :exception_handler
+
+      before_filter :load_resource, :only => [:show, :edit, :update, :destroy]
+
+
+      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.namespaced_model_name.pluralize}`.`#{attribute[:name]}` LIKE #{search_terms}"
+          }.join(" OR "))
+        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)
+        render :layout => !request.xhr?
+      end
+
+      def show
+        render :layout => !request.xhr?
+      end
+
+      def edit
+        render :layout => !request.xhr?
+      end
+
+      def create
+        instance_variable_set("@#{resource_handler.model_name}", resource_handler.model.new(params[resource_handler.namespaced_model_name.to_sym], :as => current_user.role.to_sym))
+        resource_instance_variable.save
+        render_errors_or_redirect(
+          resource_instance_variable,
+          resources_path,
+          flash_notice_for_resource_action
+        )
+      end
+
+      def update
+        resource_instance_variable.update_attributes(params[resource_handler.namespaced_model_name.to_sym], :as => current_user.role.to_sym)
+        render_errors_or_redirect(
+          resource_instance_variable,
+          resources_path,
+          flash_notice_for_resource_action
+        )
+      end
+
+      def destroy
+        resource_instance_variable.destroy
+        flash_notice_for_resource_action
+      end
+
+      def resource_handler
+        @_resource_handler ||= Alchemy::Resource.new(controller_path, alchemy_module)
+      end
+
+      protected
+
+
+      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)
+          respond_to do |format|
+            format.js { render :action => :redirect }
+            format.html { redirect_to @redirect_url }
+          end
+        else
+          respond_to do |format|
+            format.js { render_remote_errors(object, button) }
+            format.html { render :action => :new }
+          end
+        end
+      end
+
+      # Returns a translated +flash[:notice]+.
+      # The key should look like "Modelname successfully created|updated|destroyed."
+      def flash_notice_for_resource_action(action = params[:action])
+        case action.to_sym
+        when :create
+          verb = "created"
+        when :update
+          verb = "updated"
+        when :destroy
+          verb = "removed"
+        end
+        flash[:notice] = t("#{resource_handler.model_name.classify} successfully #{verb}", :default => t("Succesfully #{verb}"))
+      end
+
+      def is_alchemy_module?
+        not alchemy_module.nil? and not alchemy_module['engine_name'].nil?
+      end
+
+      def alchemy_module
+        @alchemy_module ||= module_definition_for(:controller => params[:controller], :action => 'index')
+      end
+
+      def load_resource
+        instance_variable_set("@#{resource_handler.model_name}", resource_handler.model.find(params[:id]))
+      end
+    end
+  end
 end