Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'.
This commit is contained in:
parent
cd9636a650
commit
325d47b22f
18 changed files with 218 additions and 136 deletions
|
|
@ -5,7 +5,7 @@ module MessagesHelper
|
|||
[g.name, g.id]
|
||||
end
|
||||
groups += [[" -- Bestellgruppen -- ", ""]]
|
||||
groups += Ordergroup.find(:all, :order => 'name', :include => :memberships).reject{ |g| g.memberships.empty? }.collect do |g|
|
||||
groups += Ordergroup.without_deleted(:order => 'name', :include => :memberships).reject{ |g| g.memberships.empty? }.collect do |g|
|
||||
[g.name, g.id]
|
||||
end
|
||||
groups
|
||||
|
|
|
|||
|
|
@ -10,4 +10,10 @@ module OrdersHelper
|
|||
link_to image_tag("save_pdf.png", :size => "16x16", :border => "0", :alt => "PDF erstellen"),
|
||||
{ :action => action, :id => order, :format => :pdf }, { :title => "PDF erstellen" }
|
||||
end
|
||||
|
||||
def options_for_suppliers_to_select
|
||||
suppliers = Supplier.without_deleted.collect {|s| [ s.name, url_for(:action => "new", :supplier_id => s)] }
|
||||
stockit = [["Lager", url_for(:action => 'new', :supplier_id => 0)]]
|
||||
options_for_select(stockit + suppliers)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue