From cc9384eafa6e0dfc742175d80a8ffe321aca610f Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Tue, 7 Apr 2015 10:50:20 +0300 Subject: [PATCH] Replace newlines in contacts import --- app/views/admin/contacts/partials/_address.haml | 2 +- lib/tasks/import.rake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/contacts/partials/_address.haml b/app/views/admin/contacts/partials/_address.haml index fe57bd393..33fd654dc 100644 --- a/app/views/admin/contacts/partials/_address.haml +++ b/app/views/admin/contacts/partials/_address.haml @@ -8,7 +8,7 @@ %dd= @contact.org_name %dt= t(:street) - %dd= @contact.street + %dd= @contact.street.gsub("\n", '
').html_safe %dt= t(:city) %dd= @contact.city diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index c3ecec2ab..736ac5e2e 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -166,7 +166,7 @@ namespace :import do user, x.country.try(:strip), x.id, - [x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join('\n'), + [x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join("\n"), x.city.try(:strip), x.postalcode.try(:strip), x.stateorprovince.try(:strip),