From 3a41e9530f6453f957d74a876604f04f4674dd66 Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Tue, 6 May 2014 10:51:45 +0200
Subject: [PATCH] fix order bug

---
 app/models/group_order_article.rb                 | 2 +-
 app/models/order.rb                               | 2 +-
 app/models/user.rb                                | 4 ++--
 app/models/workgroup.rb                           | 2 +-
 lib/foodsoft_messages/app/views/messages/new.haml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/group_order_article.rb b/app/models/group_order_article.rb
index f459731a..0b37bf8e 100644
--- a/app/models/group_order_article.rb
+++ b/app/models/group_order_article.rb
@@ -13,7 +13,7 @@ class GroupOrderArticle < ActiveRecord::Base
   validates_inclusion_of :tolerance, :in => 0..99
   validates_uniqueness_of :order_article_id, :scope => :group_order_id    # just once an article per group order
 
-  scope :ordered, -> { includes(:group_order => :ordergroup).order(:groups => :name) }
+  scope :ordered, -> { includes(:group_order => :ordergroup).order('groups.name') }
 
   localize_input_of :result
 
diff --git a/app/models/order.rb b/app/models/order.rb
index 6546e005..53f33c70 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -46,7 +46,7 @@ class Order < ActiveRecord::Base
       # make sure to include those articles which are no longer available
       # but which have already been ordered in this stock order
       StockArticle.available.includes(:article_category).
-        order('article_categories.name, articles.name').reject{ |a|
+        order('article_categories.name', 'articles.name').reject{ |a|
         a.quantity_available <= 0 and not a.ordered_in_order?(self)
       }.group_by { |a| a.article_category.name }
     else
diff --git a/app/models/user.rb b/app/models/user.rb
index bb98be2d..47725636 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -65,9 +65,9 @@ class User < ActiveRecord::Base
   def self.natural_order
     # would be sensible to match ApplicationController#show_user
     if FoodsoftConfig[:use_nick]
-      order('nick ASC')
+      order('nick')
     else
-      order('first_name ASC, last_name ASC')
+      order('first_name', 'last_name')
     end
   end
 
diff --git a/app/models/workgroup.rb b/app/models/workgroup.rb
index 8b5e975a..1c7d8a59 100644
--- a/app/models/workgroup.rb
+++ b/app/models/workgroup.rb
@@ -3,7 +3,7 @@ class Workgroup < Group
   
   has_many :tasks
   # returns all non-finished tasks
-  has_many :open_tasks, -> { where(:done => false).order('due_date ASC, name ASC') }, :class_name => 'Task'
+  has_many :open_tasks, -> { where(:done => false).order('due_date', 'name') }, :class_name => 'Task'
 
   validates_uniqueness_of :name
   validate :last_admin_on_earth, :on => :update
diff --git a/lib/foodsoft_messages/app/views/messages/new.haml b/lib/foodsoft_messages/app/views/messages/new.haml
index fdb9725c..e503d785 100644
--- a/lib/foodsoft_messages/app/views/messages/new.haml
+++ b/lib/foodsoft_messages/app/views/messages/new.haml
@@ -37,7 +37,7 @@
 
   #recipients
     = f.input :recipient_tokens, :input_html => { 'data-pre' => User.where(id: @message.recipients_ids).map(&:token_attributes).to_json }
-    = f.input :group_id, :as => :select, :collection => Group.undeleted.order('type DESC, name ASC').reject { |g| g.memberships.empty? }
+    = f.input :group_id, :as => :select, :collection => Group.undeleted.order('type DESC', 'name ASC').reject { |g| g.memberships.empty? }
   = f.input :private
   = f.input :subject, input_html: {class: 'input-xxlarge'}
   = f.input :body, input_html: {class: 'input-xxlarge'}