Merge remote-tracking branch 'foodcoops/master' into feature-receive

app/views/admin/users/_form.html.haml

@@ -1,5 +1,5 @@
 = simple_form_for([:admin, @user]) do |f|
-  = render 'shared/user_form_fields', f: f
+  = render 'shared/user_form_fields', f: f, password_autocomplete: false
   .form-actions
     = f.submit
     = link_to t('ui.or_cancel'), :back

app/views/finance/invoices/_form.html.haml

@@ -5,7 +5,7 @@
   - if @invoice.delivery
     %p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_delivery'), [@invoice.supplier,@invoice.delivery])).html_safe
   - if @invoice.order
-    %p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), @invoice.order)).html_safe
+    %p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), new_finance_order_path(order_id: @invoice.order.id))).html_safe
 
   = f.association :supplier, hint: false
   = f.input :number

app/views/home/profile.html.haml

@@ -6,7 +6,7 @@
       = h(t('.user.title', user: show_user))
       %small= t '.user.since', when: distance_of_time_in_words(Time.now, @current_user.created_on)
     = simple_form_for(@current_user, :url => update_profile_path) do |f|
-      = render :partial => 'shared/user_form_fields', :locals => {:f => f}
+      = render :partial => 'shared/user_form_fields', :locals => {:f => f, :password_autocomplete => 'store-only'}
       .form-actions
         = submit_tag t('ui.save'), class: 'btn'
   .span5

app/views/messages/new.haml

@@ -25,15 +25,15 @@
   - if FoodsoftConfig[:mailing_list].blank?
     = f.input :sent_to_all, :as => :boolean
   - else
-    %b= t '.list.desc', list: mail_to(FoodsoftConfig[:mailing_list])
+    %b= t('.list.desc', list: mail_to(FoodsoftConfig[:mailing_list])).html_safe
     %br/
     %small{:style => "color:grey"}
       = t '.list.subscribe_msg'
       %br/
       - if FoodsoftConfig[:mailing_list_subscribe].blank?
-        = t '.list.subscribe', link: link_to(t('.list.wiki'), wiki_page_path('MailingListe'))
+        = t('.list.subscribe', link: link_to(t('.list.wiki'), wiki_page_path('MailingListe'))).html_safe
       - else
-        = t '.list.mail', email: mail_to(FoodsoftConfig[:mailing_list_subscribe])
+        = t('.list.mail', email: mail_to(FoodsoftConfig[:mailing_list_subscribe])).html_safe
 
   #recipients
     = f.input :recipient_tokens, :input_html => { 'data-pre' => User.find_all_by_id(@message.recipients_ids).map(&:token_attributes).to_json }

app/views/shared/_user_form_fields.html.haml

@@ -1,12 +1,16 @@
-- if FoodsoftConfig[:use_nick]
-  -# use_nil option to user model validators break required mark
-  = f.input :nick, required: true
 = f.input :first_name
 = f.input :last_name
 = f.input :email
+-# need :required because :use_nil option on user model validators break the required mark
+= f.input :nick, required: true if FoodsoftConfig[:use_nick]
+-# You can control password autocompletion by passing `password_autocomplete` to this partial.
+-# Possible values: undefined/nil, true, false, 'store-only'
+-# see also https://github.com/foodcoops/foodsoft/wiki/Form-autocompletion
+- password_autocomplete = nil unless defined?(:password_autocomplete)
+- password_html = autocomplete_flag_to_password_html(password_autocomplete)
+= f.input :password, :required => f.object.new_record?, input_html: password_html
+= f.input :password_confirmation, :required => f.object.new_record?, input_html: password_html
 = f.input :phone
-= f.input :password, :required => f.object.new_record?
-= f.input :password_confirmation
 
 = f.simple_fields_for :settings_attributes do |s|
   = s.simple_fields_for :profile, defaults: { inline_label: true } do |profile|