fix #615 (#709)

newlines in applications/1/check and applications/1
hpi-swt2 · Jun 2, 2018 · 711d18e · 711d18e
1 parent d999714
commit 711d18e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/app/views/application_letters/check.html.erb b/app/views/application_letters/check.html.erb
@@ -19,13 +19,12 @@
 <h3><%= t('.my_application') %></h3>
 <dl>
   <dt><%= ApplicationLetter.human_attribute_name(:motivation) %>:</dt>
-  <dd id="application-motivation" data-orig-text="<%= @application_letter.motivation %>">
-    <%= truncate @application_letter.motivation, length: 300 do
-      link_to I18n.t('events.list.read_on'),
+  <dd id="application-motivation" data-orig-text="<%= simple_format(@application_letter.motivation) %>">
+    <%= simple_format(truncate @application_letter.motivation, length: 300, escape: false) %>
+    <%=  link_to I18n.t('events.list.read_on'),
         'javascript:jQuery("#application-motivation")
-          .text(jQuery("#application-motivation")
-            .attr("data-orig-text")); void(0)'
-      end %>
+          .html(jQuery("#application-motivation")
+            .attr("data-orig-text")); void(0)' %>
   </dd>
   <dt><%= ApplicationLetter.human_attribute_name(:organisation) %>:</dt>
   <dd><%= @application_letter.organisation %></dd>

diff --git a/app/views/application_letters/show.html.erb b/app/views/application_letters/show.html.erb
@@ -39,7 +39,7 @@
 
 <p>
   <h5><%= ApplicationLetter.human_attribute_name(:motivation) %></h5>
-  <%= @application_letter.motivation %>
+  <%= simple_format(@application_letter.motivation) %>
 </p>
 <% unless @application_letter.annotation.nil? %>
   <p>