fix csv download + template optional parameters

Conflicts:
	app/views/finance/financial_transactions/_transactions.html.haml
	app/views/home/ordergroup.html.haml
	app/views/login/_accept_invitation_form.html.haml
This commit is contained in:
wvengen 2014-06-10 16:09:43 +02:00
parent b1d085c618
commit 9e58a6f2b1
3 changed files with 25 additions and 7 deletions

View file

@ -0,0 +1,17 @@
- content_for :javascript do
:javascript
$(#{FoodsoftConfig[:use_nick] ? 'user_nick' : 'user_first_name'}).focus();
= (FoodsoftConfig[:invitation_form_message] or t('.body')).html_safe
-# empty paragraph in case when invitation_form_text does not have <p></p>
%p
- form_url = local_assigns[:accept_invitation_path]
= simple_form_for @user, url: form_url do |form|
- unless @invite and @invite.group
- capt = capture do
= form.fields_for :ordergroup do |ogf|
= ogf.input :contact_address, label: t('activerecord.attributes.ordergroup.contact_address'), required: false
= render partial: 'shared/user_form_fields', locals: {f: form, captured: capt}
.form-actions
= submit_tag t('.submit'), class: 'btn'