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

fix some link handling in i18n (using html_safe)

Browse source
This commit is contained in:
wvengen 2013-03-09 00:48:52 +01:00
parent cb537bc11c
commit 19527f8425
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/finance/invoices/_form.html.haml
View file

@ -3,9 +3,9 @@
= f.hidden_field :order_id = f.hidden_field :order_id
- if @invoice.delivery - if @invoice.delivery
%p= t '.linked', what_link: link_to(t('.delivery'), [@invoice.supplier,@invoice.delivery]) %p= t('.linked', what_link: link_to(t('.delivery'), [@invoice.supplier,@invoice.delivery])).html_safe
- if @invoice.order - if @invoice.order
%p= t '.linked', what_link: link_to(t('.order'), @invoice.order) %p= t('.linked', what_link: link_to(t('.order'), @invoice.order)).html_safe
= f.association :supplier, hint: false = f.association :supplier, hint: false
= f.input :number = f.input :number

2
app/views/finance/invoices/show.html.haml
View file

@ -6,7 +6,7 @@
- if @invoice.delivery - if @invoice.delivery
%p %p
%b= t('simple_form.labels.invoice.delivery') + ':' %b= t('simple_form.labels.invoice.delivery') + ':'
= t '.linked', what_link: link_to(t('.delivery'), [@invoice.supplier,@invoice.delivery]) = t('.linked', what_link: link_to(t('.delivery'), [@invoice.supplier,@invoice.delivery])).html_safe
%p %p
%b= t('simple_form.labels.invoice.number') + ':' %b= t('simple_form.labels.invoice.number') + ':'
= @invoice.number = @invoice.number