alchemy_crm 2.0.1 → 2.0.2

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

@@ -1,7 +1,7 @@
 module AlchemyCrm
-	module Admin
-		class BaseController < Alchemy::Admin::ResourcesController
-			include I18nHelpers
-		end
-	end
+  module Admin
+    class BaseController < Alchemy::Admin::ResourcesController
+      include I18nHelpers
+    end
+  end
 end

data/app/controllers/alchemy_crm/admin/contact_groups_controller.rb

@@ -1,23 +1,23 @@
 # encoding: UTF-8
 module AlchemyCrm
-	module Admin
-		class ContactGroupsController < AlchemyCrm::Admin::BaseController
+  module Admin
+    class ContactGroupsController < AlchemyCrm::Admin::BaseController
 
-			before_filter :load_additional_data, :only => [:new, :edit]
+      before_filter :load_additional_data, :only => [:new, :edit]
 
-			def add_filter
-				@contact_group = ContactGroup.find(params[:contact_group_id])
-				@filter = @contact_group.filters.build
-				@count = @contact_group.filters.length - 1
-			end
+      def add_filter
+        @contact_group = ContactGroup.find(params[:contact_group_id])
+        @filter = @contact_group.filters.build
+        @count = @contact_group.filters.length - 1
+      end
 
-		private
+    private
 
-			def load_additional_data
-				@contacts = Contact.all
-				@tags = ActsAsTaggableOn::Tag.order("name ASC").all
-			end
+      def load_additional_data
+        @contacts = Contact.all
+        @tags = ActsAsTaggableOn::Tag.order("name ASC").all
+      end
 
-		end
-	end
+    end
+  end
 end

data/app/controllers/alchemy_crm/admin/contacts_controller.rb

@@ -1,112 +1,112 @@
 # encoding: UTF-8
 module AlchemyCrm
-	module Admin
-		class ContactsController < AlchemyCrm::Admin::BaseController
+  module Admin
+    class ContactsController < AlchemyCrm::Admin::BaseController
 
-			include CSVMagic::ControllerActions
+      include CSVMagic::ControllerActions
 
-			csv_magic_config(
-				:mapping => {
-					Contact.human_attribute_name(:salutation).gsub(/\*$/, '') => :salutation,
-					Contact.human_attribute_name(:title)                      => :title,
-					Contact.human_attribute_name(:firstname).gsub(/\*$/, '')  => :firstname,
-					Contact.human_attribute_name(:lastname).gsub(/\*$/, '')   => :lastname,
-					Contact.human_attribute_name(:email).gsub(/\*$/, '')      => :email,
-					Contact.human_attribute_name(:organisation)               => :organisation,
-					Contact.human_attribute_name(:address)                    => :address,
-					Contact.human_attribute_name(:zip)                        => :zip,
-					Contact.human_attribute_name(:city)                       => :city,
-					Contact.human_attribute_name(:country)                    => :country,
-					Contact.human_attribute_name(:phone)                      => :phone,
-					Contact.human_attribute_name(:mobile)                     => :mobile
-				}
-			)
+      csv_magic_config(
+        :mapping => {
+          Contact.human_attribute_name(:salutation).gsub(/\*$/, '') => :salutation,
+          Contact.human_attribute_name(:title)                      => :title,
+          Contact.human_attribute_name(:firstname).gsub(/\*$/, '')  => :firstname,
+          Contact.human_attribute_name(:lastname).gsub(/\*$/, '')   => :lastname,
+          Contact.human_attribute_name(:email).gsub(/\*$/, '')      => :email,
+          Contact.human_attribute_name(:organisation)               => :organisation,
+          Contact.human_attribute_name(:address)                    => :address,
+          Contact.human_attribute_name(:zip)                        => :zip,
+          Contact.human_attribute_name(:city)                       => :city,
+          Contact.human_attribute_name(:country)                    => :country,
+          Contact.human_attribute_name(:phone)                      => :phone,
+          Contact.human_attribute_name(:mobile)                     => :mobile
+        }
+      )
 
-			before_filter :load_tags, :only => [:new, :edit]
+      before_filter :load_tags, :only => [:new, :edit]
 
-			def new
-				@contact = Contact.new(:country => ::I18n.locale.to_s.upcase)
-				render :layout => false
-			end
+      def new
+        @contact = Contact.new(:country => ::I18n.locale.to_s.upcase)
+        render :layout => false
+      end
 
-			def import
-				if request.post?
-					if params[:verified] == "1"
-						if params[:fields] || !(params[:file].content_type =~ /csv/i).nil?
-							handle_csv_post_request
-						elsif !(params[:file].content_type =~ /vcard|directory/i).nil?
-							handle_vcf_post_request
-						else
-							flash[:error] = alchemy_crm_t(:invalid_file_type)
-							redirect_to admin_contacts_path
-						end
-					else
-						@error = build_error_message(alchemy_crm_t(:imported_contacts_not_verified))
-					end
-				else
-					render :layout => !request.xhr?
-				end
-			end
+      def import
+        if request.post?
+          if params[:verified] == "1"
+            if params[:fields] || !(params[:file].content_type =~ /csv|plain|comma-separated-values/i).nil?
+              handle_csv_post_request
+            elsif !(params[:file].content_type =~ /vcard|directory/i).nil?
+              handle_vcf_post_request
+            else
+              flash[:error] = alchemy_crm_t(:invalid_file_type) % {:mime_type => params[:file].content_type}
+              redirect_to admin_contacts_path
+            end
+          else
+            @error = build_error_message(alchemy_crm_t(:imported_contacts_not_verified))
+          end
+        else
+          render :layout => !request.xhr?
+        end
+      end
 
-			def export
-				@contact = Contact.find(params[:id])
-				@contact.to_vcard
-				send_file("#{Rails.root.to_s}/tmp/#{@contact.fullname}.vcf")
-			end
+      def export
+        @contact = Contact.find(params[:id])
+        @contact.to_vcard
+        send_file("#{Rails.root.to_s}/tmp/#{@contact.fullname}.vcf")
+      end
 
-			def autocomplete_tag_list
-				items = ActsAsTaggableOn::Tag.where(['LOWER(name) LIKE ?', "#{params[:term].downcase}%"])
-				render :json => json_for_autocomplete(items, :name)
-			end
+      def autocomplete_tag_list
+        items = ActsAsTaggableOn::Tag.where(['LOWER(name) LIKE ?', "#{params[:term].downcase}%"])
+        render :json => json_for_autocomplete(items, :name)
+      end
 
-		private
+    private
 
-			def load_tags
-				@tags = ActsAsTaggableOn::Tag.order("name ASC").all
-				@tags = @tags - @contact.tags.to_a unless @contact.nil?
-			end
+      def load_tags
+        @tags = ActsAsTaggableOn::Tag.order("name ASC").all
+        @tags = @tags - @contact.tags.to_a unless @contact.nil?
+      end
 
-			def build_error_message(message)
-				heading = "<h1>#{alchemy_crm_t(:errors_while_importing)}</h1>".html_safe
-				message = "<p>#{message}</p>".html_safe
-				heading + message
-			end
+      def build_error_message(message)
+        heading = "<h1>#{alchemy_crm_t(:errors_while_importing)}</h1>".html_safe
+        message = "<p>#{message}</p>".html_safe
+        heading + message
+      end
 
-			def create_resource_items_from_csv(*args)
-				@csv_import_errors = []
-				@contacts = []
-				reader = CSVMagic::Reader.new(params)
-				reader.each do |row|
-					@contacts << contact = Contact.new(row)
-					contact.verified = true
-					contact.skip_validation = true
-					unless contact.save
-						@csv_import_errors.push [contact, contact.errors]
-					end
-				end
-				@valid_contacts = @contacts.select(&:valid?) 
-				reader.remove_file if @csv_import_errors.empty?
-			end
+      def create_resource_items_from_csv(*args)
+        @csv_import_errors = []
+        @contacts = []
+        reader = CSVMagic::Reader.new(params)
+        reader.each do |row|
+          @contacts << contact = Contact.new(row)
+          contact.verified = true
+          contact.skip_validation = true
+          unless contact.save
+            @csv_import_errors.push [contact, contact.errors]
+          end
+        end
+        @valid_contacts = @contacts.select(&:valid?) 
+        reader.remove_file if @csv_import_errors.empty?
+      end
 
-			def render_csv_import_form
-				render 'import'
-			end
+      def render_csv_import_form
+        render 'import'
+      end
 
-			def handle_vcf_post_request
-				if params[:file].blank?
-					@errors = build_error_message(alchemy_crm_t(:missing_vcard))
-				else
-					@contacts = Contact.new_from_vcard(params[:file], true)
-					if @contacts.detect(&:invalid?).nil?
-						flash[:notice] = alchemy_crm_t(:successfully_imported_contacts)
-					else
-						@errors = build_error_message(alchemy_crm_t(:please_check_highlighted_vcards_on_errors))
-					end
-				end
-				@valid_contacts = @contacts.select(&:valid?) || []
-				render :vcf_import_result
-			end
+      def handle_vcf_post_request
+        if params[:file].blank?
+          @errors = build_error_message(alchemy_crm_t(:missing_vcard))
+        else
+          @contacts = Contact.new_from_vcard(params[:file], true)
+          if @contacts.detect(&:invalid?).nil?
+            flash[:notice] = alchemy_crm_t(:successfully_imported_contacts)
+          else
+            @errors = build_error_message(alchemy_crm_t(:please_check_highlighted_vcards_on_errors))
+          end
+        end
+        @valid_contacts = @contacts.select(&:valid?) || []
+        render :vcf_import_result
+      end
 
-		end
-	end
+    end
+  end
 end

data/app/controllers/alchemy_crm/admin/deliveries_controller.rb

@@ -1,80 +1,80 @@
 # encoding: UTF-8
 module AlchemyCrm
-	module Admin
-		class DeliveriesController < AlchemyCrm::Admin::BaseController
+  module Admin
+    class DeliveriesController < AlchemyCrm::Admin::BaseController
 
-			before_filter :load_mailing, :only => [:index, :new]
+      before_filter :load_mailing, :only => [:index, :new]
 
-			def index
-				@deliveries = @mailing.deliveries.order('deliver_at DESC')
-				render :layout => false
-			end
+      def index
+        @deliveries = @mailing.deliveries.order('deliver_at DESC')
+        render :layout => false
+      end
 
-			def new
-				@delivery = Delivery.new(
-					:deliver_at => Time.now + 1.hour,
-					:mailing => @mailing
-				)
-				render :layout => false
-			end
+      def new
+        @delivery = Delivery.new(
+          :deliver_at => Time.now + 1.hour,
+          :mailing => @mailing
+        )
+        render :layout => false
+      end
 
-			def show
-				begin
-					@delivery = Delivery.find(params[:id])
-					@recipients = @delivery.recipients
-					@read = @delivery.recipients.select{|r| r.read}
-					@reacted = @delivery.recipients.select{|r| r.reacted}
-					@bounced = @delivery.recipients.select{|r| r.bounced}
-				rescue
-					log_error($!)
-				end
-				render :layout => false
-			end
+      def show
+        begin
+          @delivery = Delivery.find(params[:id])
+          @recipients = @delivery.recipients
+          @read = @delivery.recipients.select{|r| r.read}
+          @reacted = @delivery.recipients.select{|r| r.reacted}
+          @bounced = @delivery.recipients.select{|r| r.bounced}
+        rescue
+          log_error($!)
+        end
+        render :layout => false
+      end
 
-			def create
-				@delivery = Delivery.new(params[:delivery])
-				@mailing = @delivery.mailing = Mailing.find(params[:delivery][:mailing_id])
-				if @delivery.save
-					@delivery.send_chunks(
-						:language_id => session[:language_id],
-						:protocol => request.protocol,
-						:host => request.host,
-						:port => request.port,
-						:locale => ::I18n.locale
-					)
-					flash[:notice] = alchemy_crm_t(:successfully_scheduled_mailing)
-				end
-				redirect_to admin_mailings_path
-			end
+      def create
+        @delivery = Delivery.new(params[:delivery])
+        @mailing = @delivery.mailing = Mailing.find(params[:delivery][:mailing_id])
+        if @delivery.save
+          @delivery.send_chunks(
+            :language_id => session[:language_id],
+            :protocol => request.protocol,
+            :host => request.host,
+            :port => request.port,
+            :locale => ::I18n.locale
+          )
+          flash[:notice] = alchemy_crm_t(:successfully_scheduled_mailing)
+        end
+        redirect_to admin_mailings_path
+      end
 
-			def edit
-				@delivery = Delivery.find(params[:id])
-				@mailing = @delivery.mailing
-				render :layout => false
-			end
+      def edit
+        @delivery = Delivery.find(params[:id])
+        @mailing = @delivery.mailing
+        render :layout => false
+      end
 
-			def update
-				@delivery = Delivery.find(params[:id])
-				@delivery.update_attributes(params[:delivery])
-				render_errors_or_redirect(
-					@delivery,
-					admin_mailings_path,
-					alchemy_crm_t(:successfully_rescheduled_mailing)
-				)
-			end
+      def update
+        @delivery = Delivery.find(params[:id])
+        @delivery.update_attributes(params[:delivery])
+        render_errors_or_redirect(
+          @delivery,
+          admin_mailings_path,
+          alchemy_crm_t(:successfully_rescheduled_mailing)
+        )
+      end
 
-			def destroy
-				@delivery = Delivery.find(params[:id])
-				@delivery.destroy
-				render :js => "window.location.replace('#{admin_mailings_path}'); Alchemy.growl('#{successfully_canceled_delivery}')"
-			end
+      def destroy
+        @delivery = Delivery.find(params[:id])
+        @delivery.destroy
+        render :js => "window.location.replace('#{admin_mailings_path}'); Alchemy.growl('#{successfully_canceled_delivery}')"
+      end
 
-		private
+    private
 
-			def load_mailing
-				@mailing = Mailing.find(params[:mailing_id])
-			end
+      def load_mailing
+        @mailing = Mailing.find(params[:mailing_id])
+      end
 
-		end
-	end
+    end
+  end
 end

data/app/controllers/alchemy_crm/admin/elements_controller_extension.rb

@@ -3,30 +3,30 @@
 
 Alchemy::Admin::ElementsController.class_eval do
 
-	 def teasables
-		@pages = Alchemy::Page.language_root_for(session[:language_id]).descendants
-		@content = Content.find(params[:content_id])
-		@element = @content.element
-		@elements = Alchemy::Element.where(:name => @content.settings[:teasable_elements])
-		render :layout => false
-	end
+  def teasables
+    @pages = Alchemy::Page.language_root_for(session[:language_id]).descendants
+    @content = Content.find(params[:content_id])
+    @element = @content.element
+    @elements = Alchemy::Element.where(:name => @content.settings[:teasable_elements])
+    render :layout => false
+  end
 
-	def fill
-		@element = Alchemy::Element.find(params[:id])
-		@source_element = Alchemy::Element.find(params[:source_element_id])
-		@params = "?page_id=#{@source_element.page.id}&element_id=#{@source_element.id}"
-		@content = @element.contents.where(:essence_type => "EssenceRichtext")
-		@target_contents = []
-		@source_element.contents.each do |content|
-			@target_contents << @element.contents.select { |c| c.essence_type == content.essence_type && c.name == content.name }
-		end
-	end
+  def fill
+    @element = Alchemy::Element.find(params[:id])
+    @source_element = Alchemy::Element.find(params[:source_element_id])
+    @params = "?page_id=#{@source_element.page.id}&element_id=#{@source_element.id}"
+    @content = @element.contents.where(:essence_type => "EssenceRichtext")
+    @target_contents = []
+    @source_element.contents.each do |content|
+      @target_contents << @element.contents.select { |c| c.essence_type == content.essence_type && c.name == content.name }
+    end
+  end
 
-	def link
-		@element = Alchemy::Element.find(params[:id])
-		@source_element = Alchemy::Element.find(params[:source_element_id])
-		@content = @element.contents.where(:essence_type => "EssenceElementTeaser")
-		@params = "?page_id=#{@source_element.page.id}&element_id=#{@source_element.id}"
-	end
+  def link
+    @element = Alchemy::Element.find(params[:id])
+    @source_element = Alchemy::Element.find(params[:source_element_id])
+    @content = @element.contents.where(:essence_type => "EssenceElementTeaser")
+    @params = "?page_id=#{@source_element.page.id}&element_id=#{@source_element.id}"
+  end
 
 end