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

x_11_file_import_via_plugin #65

Open
flip wants to merge 65 commits from x_11_file_import_via_plugin into develop
pull from: x_11_file_import_via_plugin
merge into: Foodsoft:develop
Conversation 0 Commits 65 Files changed 463 +4 -4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0d40e4e9c5 - Show all commits

8
app/views/articles/_sync_table.html.haml
View file

@ -32,8 +32,8 @@
= form.text_field 'name', :size => 0 = form.text_field 'name', :size => 0
- hidden_fields.each do |field| - hidden_fields.each do |field|
= form.hidden_field field = form.hidden_field field
%td{:style => highlight_new(attrs, :note)}= form.text_field 'note', class: 'input-small' %td{:style => highlight_new(attrs, :note)}= form.text_field 'note', class: 'input-medium'
%td{:style => highlight_new(attrs, :manufacturer)}= form.text_field 'manufacturer', class: 'input-small' %td{:style => highlight_new(attrs, :manufacturer)}= form.text_field 'manufacturer', class: 'input-medium'
%td{:style => highlight_new(attrs, :origin)}= form.text_field 'origin', class: 'input-mini' %td{:style => highlight_new(attrs, :origin)}= form.text_field 'origin', class: 'input-mini'
%td{:style => highlight_new(attrs, :unit)}= form.text_field 'unit', class: 'input-mini' %td{:style => highlight_new(attrs, :unit)}= form.text_field 'unit', class: 'input-mini'
%td{:style => highlight_new(attrs, :unit_quantity)}= form.text_field 'unit_quantity', class: 'input-mini' %td{:style => highlight_new(attrs, :unit_quantity)}= form.text_field 'unit_quantity', class: 'input-mini'
@ -49,8 +49,8 @@
.input-prepend .input-prepend
%span.add-on= t 'number.currency.format.unit' %span.add-on= t 'number.currency.format.unit'
= form.text_field 'deposit', class: 'input-mini', style: 'width: 45px' = form.text_field 'deposit', class: 'input-mini', style: 'width: 45px'
%td= form.select :article_category_id, ArticleCategory.all.map {|a| [ a.name, a.id ] }, %td{:style => highlight_new(attrs, :article_category)}
{include_blank: true}, class: 'input-small' = form.select :article_category_id, ArticleCategory.all.map {|a| [ a.name, a.id ] }, {include_blank: true}
- unless changed_article.errors.empty? - unless changed_article.errors.empty?
%tr.alert %tr.alert
%td(colspan=11)= changed_article.errors.full_messages.join(', ') %td(colspan=11)= changed_article.errors.full_messages.join(', ')