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

Remove broken sort-by-price; comment redundancy of stock_change template

Browse source
This commit is contained in:
Julius 2013-06-13 23:51:37 +02:00
parent 65f61e09d5
commit 3a48d1576f
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/deliveries/_form.html.haml
View file

@ -51,9 +51,7 @@
= t '.article' = t '.article'
%span.sorter-bar.default-sort-asc{:data => {'compare-function' => 'compareText', 'sort-criterion' => 'sort-by-name'}} %span.sorter-bar.default-sort-asc{:data => {'compare-function' => 'compareText', 'sort-criterion' => 'sort-by-name'}}
%th= t '.unit' %th= t '.unit'
%th %th= t '.price'
= t '.price'
%span.sorter-bar{:data => {'compare-function' => 'compareFloat', 'sort-criterion' => 'sort-by-price'}}
%th= t '.vat' %th= t '.vat'
%th %th
= t '.category' = t '.category'
@ -75,6 +73,9 @@
%th= t '.quantity' %th= t '.quantity'
%th= t '.actions' %th= t '.actions'
%tbody %tbody
-# see also the partial 'stock_change' which is used for AJAX updates!
-# see also the partial 'stock_change' which is used for AJAX updates!
-# see also the partial 'stock_change' which is used for AJAX updates!
= f.fields_for :stock_changes do |stock_change_form| = f.fields_for :stock_changes do |stock_change_form|
- stock_change = stock_change_form.object - stock_change = stock_change_form.object
%tr{:id => "stock_change_stock_article_#{stock_change.stock_article.id}", :data => {:id => stock_change.stock_article.id}} %tr{:id => "stock_change_stock_article_#{stock_change.stock_article.id}", :data => {:id => stock_change.stock_article.id}}

3
app/views/deliveries/_stock_change.html.haml
View file

@ -1,3 +1,6 @@
-# see also the partial 'form' which is used for existing stock_changes when loading the edit!
-# see also the partial 'form' which is used for existing stock_changes when loading the edit!
-# see also the partial 'form' which is used for existing stock_changes when loading the edit!
= fields_for "delivery[new_stock_changes][]", stock_change, validate: true do |f| = fields_for "delivery[new_stock_changes][]", stock_change, validate: true do |f|
- f.object.quantity = '' if 0 == f.object.quantity - f.object.quantity = '' if 0 == f.object.quantity
%tr{:id => "stock_change_stock_article_#{stock_change.stock_article.id}", :data => {:id => stock_change.stock_article.id}} %tr{:id => "stock_change_stock_article_#{stock_change.stock_article.id}", :data => {:id => stock_change.stock_article.id}}