Upgraded to rails 3.1.8. Fixed various bugs in wiki.

app/models/group_order.rb

@@ -14,8 +14,8 @@ class GroupOrder < ActiveRecord::Base
   validates_numericality_of :price
   validates_uniqueness_of :ordergroup_id, :scope => :order_id   # order groups can only order once per order
 
-  scope :open, lambda { {:conditions => ["order_id IN (?)", Order.open.collect(&:id)]} }
-  scope :finished, lambda { {:conditions => ["order_id IN (?)", Order.finished_not_closed.collect(&:id)]} }
+  scope :in_open_orders, joins(:order).merge(Order.open)
+  scope :in_finished_orders, joins(:order).merge(Order.finished_not_closed)
 
   # Generate some data for the javascript methods in ordering view
   def load_data

app/models/order.rb

@@ -23,11 +23,11 @@ class Order < ActiveRecord::Base
   after_update :update_price_of_group_orders
  
   # Finders
-  scope :open, :conditions => {:state => 'open'}, :order => 'ends DESC'
-  scope :finished, :conditions => "state = 'finished' OR state = 'closed'", :order => 'ends DESC'
-  scope :finished_not_closed, :conditions => {:state => 'finished'}, :order => 'ends DESC'
-  scope :closed, :conditions => {:state => 'closed'}, :order => 'ends DESC'
-  scope :stockit, :conditions => {:supplier_id => 0}, :order => 'ends DESC'
+  scope :open, where(state: 'open').order('ends DESC')
+  scope :finished, where("state = 'finished' OR state = 'closed'").order('ends DESC')
+  scope :finished_not_closed, where(state: 'finished').order('ends DESC')
+  scope :closed, where(state: 'closed').order('ends DESC')
+  scope :stockit, where(supplier_id: 0).order('ends DESC')
 
   def stockit?
     supplier_id == 0

app/models/ordergroup.rb

@@ -26,11 +26,11 @@ class Ordergroup < Group
   end
 
   def value_of_open_orders(exclude = nil)
-    group_orders.open.reject{|go| go == exclude}.collect(&:price).sum
+    group_orders.in_open_orders.reject{|go| go == exclude}.collect(&:price).sum
   end
   
   def value_of_finished_orders(exclude = nil)
-    group_orders.finished.reject{|go| go == exclude}.collect(&:price).sum
+    group_orders.in_finished_orders.reject{|go| go == exclude}.collect(&:price).sum
   end
 
   # Returns the available funds for this order group (the account_balance minus price of all non-closed GroupOrders of this group).

app/models/user.rb

@@ -7,7 +7,11 @@ class User < ActiveRecord::Base
   
   has_many :memberships, :dependent => :destroy
   has_many :groups, :through => :memberships
-  has_one :ordergroup, :through => :memberships, :source => :group, :class_name => "Ordergroup"
+  #has_one :ordergroup, :through => :memberships, :source => :group, :class_name => "Ordergroup"
+  def ordergroup
+    Ordergroup.joins(:memberships).where(memberships: {user_id: self.id}).first
+  end
+
   has_many :workgroups, :through => :memberships, :source => :group, :class_name => "Workgroup"
   has_many :assignments, :dependent => :destroy
   has_many :tasks, :through => :assignments