Improve unlock button for receiving OrderArticles manually adjusted

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

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