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

3
app/views/orders/_edit_amount.html.haml
View file

@ -25,6 +25,3 @@
%td.units_delta
%td
= link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article, without_units: true), remote: true, class: 'btn btn-small'
- if order_article.result_manually_changed?
= button_tag nil, class: 'btn btn-small unlocker', title: t('.locked_to_protect_unlock_button') do
%i.icon-unlock

4
app/views/orders/_edit_amounts.html.haml
View file

@ -62,8 +62,8 @@
}
function unlock_receive_input_field() {
$('.units_received', $(this).closest('tr')).prop('disabled', false);
$(this).remove();
$('.units_received', $(this).closest('tr')).prop('disabled', false).focus();
$(this).replaceWith('<i class="icon icon-warning-sign add-on"></i>');
}
%table#order_articles.ordered-articles.table.table-striped.stupidtable