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

Merge pull request #227 from foodcoop-rostock/fix-escape-new-message-hint

Browse source 
Do not escape mailing list links in message form
This commit is contained in:
wvengen 2013-12-21 16:14:20 -08:00
commit 537ac52f4e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/messages/new.haml
View file

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