Use domain model function select options. Added garbage collection to

user segment cache.
cykod · May 25, 2010 · e09e47f · e09e47f
1 parent 08b6f8b
commit e09e47f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb
@@ -83,7 +83,7 @@ def self.convert_to(value, type, opts={})
   end
 
   def self.model_options(opts={})
-    opts[:class].find(:all, {:select => 'id, name', :order => 'name'}.merge(opts[:options] || {})).collect { |item| [item.name, item.id] }
+    opts[:class].select_options
   end
 
   def self.convert_arguments(arguments, types, options)

diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb
@@ -56,6 +56,8 @@ def find_in_batches(opts={})
       users = self.fetch_users(:offset => offset, :limit => limit)
       offset = offset + limit
       yield users
+      users = nil
+      GC.start
     end
   end