enhancement Ana Livia

woese · Jun 13, 2013 · 54cabea · 54cabea
1 parent c693199
commit 54cabea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/active_crm/app/controllers/guara/active_crm/scheduled_contacts_controller.rb b/active_crm/app/controllers/guara/active_crm/scheduled_contacts_controller.rb
@@ -14,10 +14,10 @@ def index
     			search = prepare_filter_search(params[:search], scheduled_customer_group)
 
     			@search = Guara::Customer.customer_contact(params[:scheduled_customer_group_id]).search(search)
-                @search_scheduled = Guara::Customer.customer_scheduled(params[:scheduled_customer_group_id]).search(search)
+          @search_scheduled = Guara::Customer.customer_scheduled(params[:scheduled_customer_group_id]).search(search)
 
-                @customers_to_register = paginate(@search, params[:page], 5)
-                @customers_scheduled = paginate(@search_scheduled)
+          @customers_to_register = paginate(@search, params[:page], 40)
+          @customers_scheduled = paginate(@search_scheduled)
     		end
 
             def new

diff --git a/crm/app/models/guara/task_type.rb b/crm/app/models/guara/task_type.rb
@@ -1,9 +1,10 @@
 module Guara
   class TaskType < ActiveRecord::Base
     attr_accessible :enabled, :name, :company_business, :company_business_id
-
+    
     include ActiveExtend::ActiveDisablable
-
+    default_scope order(:name)
+
     belongs_to :company_business
 
     def self.for_business(company_business)