alchemy_crm 2.0.1 → 2.0.2

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

@@ -1,47 +1,47 @@
 # encoding: UTF-8
 module AlchemyCrm
-	module Admin
-		class MailingsController < AlchemyCrm::Admin::BaseController
-
-			before_filter :load_newsletters, :only => [:new, :edit, :copy]
-
-			helper 'AlchemyCrm::Mailings'
-			helper 'Alchemy::Admin::Pages'
-
-			def copy
-				@mailing = Mailing.copy(params[:id])
-				render :action => :new, :layout => false
-			end
-
-			def show
-				@mailing = Mailing.find(params[:id])
-				@page = @mailing.page
-				@contact = Contact.fake
-				@recipient = Recipient.new_from_contact(@contact)
-				@preview_mode = true
-				render :layout => 'alchemy_crm/mailings'
-			end
-
-			def edit_content
-				@mailing = Mailing.find(params[:id])
-				@page = @mailing.page
-			end
-
-			def update
-				@mailing.update_attributes(params[:mailing], :as => current_user.role.to_sym)
-				render_errors_or_redirect(
-					@mailing,
-					:back,
-					flash_notice_for_resource_action
-				)
-			end
-
-		private
-
-			def load_newsletters
-				@newsletters = Newsletter.all
-			end
-
-		end
-	end
+  module Admin
+    class MailingsController < AlchemyCrm::Admin::BaseController
+
+      before_filter :load_newsletters, :only => [:new, :edit, :copy]
+
+      helper 'AlchemyCrm::Mailings'
+      helper 'Alchemy::Admin::Pages'
+
+      def copy
+        @mailing = Mailing.copy(params[:id])
+        render :action => :new, :layout => false
+      end
+
+      def show
+        @mailing = Mailing.find(params[:id])
+        @page = @mailing.page
+        @contact = Contact.fake
+        @recipient = Recipient.new_from_contact(@contact)
+        @preview_mode = true
+        render :layout => 'alchemy_crm/mailings'
+      end
+
+      def edit_content
+        @mailing = Mailing.find(params[:id])
+        @page = @mailing.page
+      end
+
+      def update
+        @mailing.update_attributes(params[:mailing], :as => current_user.role.to_sym)
+        render_errors_or_redirect(
+          @mailing,
+          :back,
+          flash_notice_for_resource_action
+        )
+      end
+
+    private
+
+      def load_newsletters
+        @newsletters = Newsletter.all
+      end
+
+    end
+  end
 end

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

@@ -1,24 +1,24 @@
 # encoding: UTF-8
 module AlchemyCrm
-	module Admin
-		class NewslettersController < AlchemyCrm::Admin::BaseController
+  module Admin
+    class NewslettersController < AlchemyCrm::Admin::BaseController
 
-			before_filter :load_additional_data, :only => [:new, :edit]
+      before_filter :load_additional_data, :only => [:new, :edit]
 
-			def update
-				params[:newsletter][:contact_group_ids] ||= []
-				@newsletter = Newsletter.find(params[:id])
-				@newsletter.update_attributes(params[:newsletter])
-				render_errors_or_redirect @newsletter, admin_newsletters_path, alchemy_crm_t(:successfully_updated_newsletter)
-			end
+      def update
+        params[:newsletter][:contact_group_ids] ||= []
+        @newsletter = Newsletter.find(params[:id])
+        @newsletter.update_attributes(params[:newsletter])
+        render_errors_or_redirect @newsletter, admin_newsletters_path, alchemy_crm_t(:successfully_updated_newsletter)
+      end
 
-		private
+    private
 
-			def load_additional_data
-				@page_layouts = AlchemyCrm::NewsletterLayout.get_layouts_for_select()
-				@contact_groups = ContactGroup.order("name ASC").all
-			end
+      def load_additional_data
+        @page_layouts = AlchemyCrm::NewsletterLayout.get_layouts_for_select()
+        @contact_groups = ContactGroup.order("name ASC").all
+      end
 
-		end
-	end
+    end
+  end
 end

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

@@ -1,62 +1,63 @@
 # encoding: UTF-8
 module AlchemyCrm
-	module Admin
-		class TagsController < Alchemy::Admin::BaseController
-
-			include I18nHelpers
-			helper 'AlchemyCrm::Admin::Base'
-
-			before_filter :load_tag, :only => [:edit, :update, :destroy]
-
-			def index
-				@tags = ActsAsTaggableOn::Tag.where(
-					"name LIKE '%#{params[:query]}%'"
-				).page(params[:page] || 1).per(per_page_value_for_screen_size).order("name ASC")
-			end
-
-			def new
-				@tag = ActsAsTaggableOn::Tag.new
-				render :layout => false
-			end
-
-			def create
-				@tag = ActsAsTaggableOn::Tag.create(params[:tag])
-				render_errors_or_redirect @tag, admin_tags_path, alchemy_crm_t('New Tag Created')
-			end
-
-			def edit
-				@tags = ActsAsTaggableOn::Tag.order("name ASC").all - [@tag]
-				render :layout => false
-			end
-
-			def update
-				if params[:replace]
-					@new_tag = ActsAsTaggableOn::Tag.find(params[:tag][:merge_to])
-					Contact.replace_tag @tag, @new_tag
-					operation_text = alchemy_crm_t('Replaced Tag %{old_tag} with %{new_tag}') % {:old_tag => @tag.name, :new_tag => @new_tag.name}
-					@tag.destroy
-				else
-					@tag.update_attributes(params[:tag])
-					@tag.save
-					operation_text = t(:successfully_updated_tag)
-				end
-				render_errors_or_redirect @tag, admin_tags_path, operation_text
-			end
-
-			def destroy
-				if request.delete?
-					@tag.destroy
-					flash[:notice] = t(:successfully_deleted_tag)
-				end
-				redirect_to admin_tags_path
-			end
-
-		private
-
-			def load_tag
-				@tag = ActsAsTaggableOn::Tag.find(params[:id])
-			end
-
-		end
-	end
+  module Admin
+    class TagsController < Alchemy::Admin::BaseController
+
+      include I18nHelpers
+      helper 'AlchemyCrm::Admin::Base'
+
+      before_filter :load_tag, :only => [:edit, :update, :destroy]
+
+      def index
+        @tags = ActsAsTaggableOn::Tag.where(
+          "name LIKE '%#{params[:query]}%'"
+        ).page(params[:page] || 1).per(per_page_value_for_screen_size).order("name ASC")
+      end
+
+      def new
+        @tag = ActsAsTaggableOn::Tag.new
+        render :layout => false
+      end
+
+      def create
+        @tag = ActsAsTaggableOn::Tag.create(params[:tag])
+        render_errors_or_redirect @tag, admin_tags_path, alchemy_crm_t('New Tag Created')
+      end
+
+      def edit
+        @tags = ActsAsTaggableOn::Tag.order("name ASC").all - [@tag]
+        render :layout => false
+      end
+
+      def update
+        if params[:replace]
+          @new_tag = ActsAsTaggableOn::Tag.find(params[:tag][:merge_to])
+          Contact.replace_tag @tag, @new_tag
+          operation_text = alchemy_crm_t('Replaced Tag %{old_tag} with %{new_tag}') % {:old_tag => @tag.name, :new_tag => @new_tag.name}
+          @tag.destroy
+        else
+          @tag.update_attributes(params[:tag])
+          @tag.save
+          operation_text = alchemy_crm_t(:successfully_updated_tag)
+        end
+        render_errors_or_redirect @tag, admin_tags_path, operation_text
+      end
+
+      def destroy
+        if request.delete?
+          @tag.destroy
+          flash[:notice] = alchemy_crm_t(:successfully_deleted_tag)
+        end
+        @redirect_url = admin_tags_path
+        render :action => :redirect
+      end
+
+    private
+
+      def load_tag
+        @tag = ActsAsTaggableOn::Tag.find(params[:id])
+      end
+
+    end
+  end
 end

data/app/controllers/alchemy_crm/base_controller.rb

@@ -1,5 +1,5 @@
 module AlchemyCrm
-	class BaseController < Alchemy::BaseController
-		include I18nHelpers
-	end
+  class BaseController < Alchemy::BaseController
+    include I18nHelpers
+  end
 end

data/app/controllers/alchemy_crm/contacts_controller.rb

@@ -1,103 +1,103 @@
 # encoding: UTF-8
 module AlchemyCrm
-	class ContactsController < AlchemyCrm::BaseController
+  class ContactsController < AlchemyCrm::BaseController
 
-		helper 'Alchemy::Pages'
-		layout :layout_for_page
+    helper 'Alchemy::Pages'
+    layout :layout_for_page
 
-		before_filter :load_signup_form, :only => [:show, :signup, :verify]
-		before_filter :load_signout_form, :only => [:signout, :disable]
+    before_filter :load_signup_form, :only => [:show, :signup, :verify]
+    before_filter :load_signout_form, :only => [:signout, :disable]
 
-		def show
-			@page = @element.page
-			@root_page = @page.get_language_root
-			render :template => 'alchemy/pages/show'
-		end
+    def show
+      @page = @element.page
+      @root_page = @page.get_language_root
+      render :template => 'alchemy/pages/show'
+    end
 
-		def signup
-			@contact = Contact.new(params[:contact])
-			if @contact.save
-				ContactsMailer.signup_mail(
-					@contact,
-					Alchemy::Page.find_by_page_layout_and_language_id('newsletter_mails', session[:language_id])
-				).deliver
-				@contact_signed_up = true
-			else
-				@contact_signed_up = false
-			end
-			@page = @element.page
-			@root_page = @page.get_language_root
-			render :template => 'alchemy/pages/show'
-		end
+    def signup
+      @contact = Contact.new(params[:contact])
+      if @contact.save
+        ContactsMailer.signup_mail(
+          @contact,
+          Alchemy::Page.find_by_page_layout_and_language_id('newsletter_mails', session[:language_id])
+        ).deliver
+        @contact_signed_up = true
+      else
+        @contact_signed_up = false
+      end
+      @page = @element.page
+      @root_page = @page.get_language_root
+      render :template => 'alchemy/pages/show'
+    end
 
-		def verify
-			@contact = Contact.find_by_email_sha1(params[:token])
-			if @contact
-				@contact_verified = @contact.update_attribute(:verified, true)
-				if params[:newsletter_ids]
-					@subscriptions = @contact.subscriptions.where(:newsletter_id => params[:newsletter_ids])
-				else
-					@subscriptions = @contact.subscriptions
-				end
-				@subscriptions.each do |subscription|
-					subscription.update_attribute(:verified, true)
-				end
-				@page = @element.page
-				@root_page = @page.get_language_root
-				render :template => 'alchemy/pages/show'
-			else
-				contact_not_found
-			end
-		end
+    def verify
+      @contact = Contact.find_by_email_sha1(params[:token])
+      if @contact
+        @contact_verified = @contact.update_attribute(:verified, true)
+        if params[:newsletter_ids]
+          @subscriptions = @contact.subscriptions.where(:newsletter_id => params[:newsletter_ids])
+        else
+          @subscriptions = @contact.subscriptions
+        end
+        @subscriptions.each do |subscription|
+          subscription.update_attribute(:verified, true)
+        end
+        @page = @element.page
+        @root_page = @page.get_language_root
+        render :template => 'alchemy/pages/show'
+      else
+        contact_not_found
+      end
+    end
 
-		def signout
-			@contact = Contact.find_by_email_and_verified(params[:email], true)
-			if @contact.blank?
-				flash[:notice] = ::I18n.t(:contact_unknown, :scope => :alchemy_crm)
-				@contact_signed_out = false
-			else
-				ContactsMailer.signout_mail(
-					@contact,
-					Alchemy::Page.find_by_page_layout_and_language_id('newsletter_mails', session[:language_id])
-				).deliver
-				@contact_signed_out = true
-			end
-			@page = @element.page
-			@root_page = @page.get_language_root
-			render :template => 'alchemy/pages/show'
-		end
+    def signout
+      @contact = Contact.find_by_email_and_verified(params[:email], true)
+      if @contact.blank?
+        flash[:notice] = ::I18n.t(:contact_unknown, :scope => :alchemy_crm)
+        @contact_signed_out = false
+      else
+        ContactsMailer.signout_mail(
+          @contact,
+          Alchemy::Page.find_by_page_layout_and_language_id('newsletter_mails', session[:language_id])
+        ).deliver
+        @contact_signed_out = true
+      end
+      @page = @element.page
+      @root_page = @page.get_language_root
+      render :template => 'alchemy/pages/show'
+    end
 
-		def disable
-			@contact = Contact.find_by_email_sha1(params[:token])
-			if @contact
-				@contact_disabled = @contact.disable!
-				@page = @element.page
-				@root_page = @page.get_language_root
-				render :template => 'alchemy/pages/show'
-			else
-				contact_not_found
-			end
-		end
+    def disable
+      @contact = Contact.find_by_email_sha1(params[:token])
+      if @contact
+        @contact_disabled = @contact.disable!
+        @page = @element.page
+        @root_page = @page.get_language_root
+        render :template => 'alchemy/pages/show'
+      else
+        contact_not_found
+      end
+    end
 
-	private
+  private
 
-		def load_signup_form
-			@element = Alchemy::Element.find_by_name('newsletter_signup_form')
-			if @element.blank?
-				raise ActiveRecord::RecordNotFound, "Alchemy::Element with name 'newsletter_signup_form' not found!"
-			end
-		end
+    def load_signup_form
+      @element = Alchemy::Element.find_by_name('newsletter_signup_form')
+      if @element.blank?
+        raise ActiveRecord::RecordNotFound, "Alchemy::Element with name 'newsletter_signup_form' not found!"
+      end
+    end
 
-		def load_signout_form
-			@element = Alchemy::Element.find_by_name('newsletter_signout_form')
-			if @element.blank?
-				raise ActiveRecord::RecordNotFound, "Alchemy::Element with name 'newsletter_signout_form' not found!"
-			end
-		end
+    def load_signout_form
+      @element = Alchemy::Element.find_by_name('newsletter_signout_form')
+      if @element.blank?
+        raise ActiveRecord::RecordNotFound, "Alchemy::Element with name 'newsletter_signout_form' not found!"
+      end
+    end
 
-		def contact_not_found
-			raise ActionController::RoutingError.new('Contact Not Found')
-		end
+    def contact_not_found
+      raise ActionController::RoutingError.new('Contact Not Found')
+    end
 
-	end
+  end
 end