Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

fix order bug

Browse source
This commit is contained in:
wvengen 2014-05-06 10:51:45 +02:00
parent 3953c21ae2
commit 3a41e9530f
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/group_order_article.rb
View file

@ -13,7 +13,7 @@ class GroupOrderArticle < ActiveRecord::Base
validates_inclusion_of :tolerance, :in => 0..99 validates_inclusion_of :tolerance, :in => 0..99
validates_uniqueness_of :order_article_id, :scope => :group_order_id # just once an article per group order 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 localize_input_of :result

2
app/models/order.rb
View file

@ -46,7 +46,7 @@ class Order < ActiveRecord::Base
# make sure to include those articles which are no longer available # make sure to include those articles which are no longer available
# but which have already been ordered in this stock order # but which have already been ordered in this stock order
StockArticle.available.includes(:article_category). 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) a.quantity_available <= 0 and not a.ordered_in_order?(self)
}.group_by { |a| a.article_category.name } }.group_by { |a| a.article_category.name }
else else

4
app/models/user.rb
View file

@ -65,9 +65,9 @@ class User < ActiveRecord::Base
def self.natural_order def self.natural_order
# would be sensible to match ApplicationController#show_user # would be sensible to match ApplicationController#show_user
if FoodsoftConfig[:use_nick] if FoodsoftConfig[:use_nick]
order('nick ASC') order('nick')
else else
order('first_name ASC, last_name ASC') order('first_name', 'last_name')
end end
end end

2
app/models/workgroup.rb
View file

@ -3,7 +3,7 @@ class Workgroup < Group
has_many :tasks has_many :tasks
# returns all non-finished 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 validates_uniqueness_of :name
validate :last_admin_on_earth, :on => :update validate :last_admin_on_earth, :on => :update

2
lib/foodsoft_messages/app/views/messages/new.haml
View file

@ -37,7 +37,7 @@
#recipients #recipients
= f.input :recipient_tokens, :input_html => { 'data-pre' => User.where(id: @message.recipients_ids).map(&:token_attributes).to_json } = 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 :private
= f.input :subject, input_html: {class: 'input-xxlarge'} = f.input :subject, input_html: {class: 'input-xxlarge'}
= f.input :body, input_html: {class: 'input-xxlarge'} = f.input :body, input_html: {class: 'input-xxlarge'}