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

Improve unlock button for receiving OrderArticles manually adjusted

Browse source 
Conflicts:
	app/views/orders/_edit_amount.html.haml
This commit is contained in:
Julius 2014-01-03 22:26:20 +01:00 • committed by wvengen
parent a8e604c196
commit 8479678530
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/helpers/orders_helper.rb
View file

@ -46,10 +46,21 @@ module OrdersHelper
def receive_input_field(form)
order_article = form.object
units_expected = (order_article.units_billed or order_article.units_to_order)
form.text_field :units_received, class: 'input-nano package units_received',
# unlock button, to prevent overwriting if it was manually distributed
input_html = ''
if order_article.result_manually_changed?
input_html += '<span class="input-prepend intable">' +
button_tag(nil, type: :button, class: 'btn unlocker', title: t('.locked_to_protect_unlock_button')) {'<i class="icon icon-unlock"></i>'.html_safe}
end
input_html += form.text_field :units_received, class: 'input input-nano package units_received',
data: {'units-expected' => units_expected},
disabled: order_article.result_manually_changed?,
title: order_article.result_manually_changed? ? t('.locked_to_protect_manual_update') : nil,
autocomplete: 'off'
input_html += '</span>' if order_article.result_manually_changed?
input_html.html_safe
end
end