[Git][noosfero/noosfero][stable-1.10] Merge branch 'comment-report' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.10 at Noosfero / noosfero


Commits:
15d3a92b by Rodrigo Souto at 2018-01-25T18:09:25+00:00
Merge branch 'comment-report' into 'master'

Fix comment report

See merge request noosfero/noosfero!1377

(cherry picked from commit d29855c7a12ed57415fbc529900fd9972ae838ad)

5a699d80 Change the local comment variable to article
- - - - -


1 changed file:

- app/views/shared/reported_versions/profile/_comment.html.erb


Changes:

=====================================
app/views/shared/reported_versions/profile/_comment.html.erb
=====================================
--- a/app/views/shared/reported_versions/profile/_comment.html.erb
+++ b/app/views/shared/reported_versions/profile/_comment.html.erb
@@ -1,10 +1,10 @@
 <ul>
-  <li><%= (content_tag('strong', _('Title') + ': ') + comment.title)  if comment.title %> </li>
+  <li><%= (content_tag('strong', _('Title') + ': ') + article.title)  if article.title %> </li>
   <li><%= content_tag('strong', _('Type') + ': ') + _('Comment') %> </li>
   <li>
-    <%= (content_tag('strong', _('Original content') + ': ') + link_to(comment.title || url_for(comment.url), comment.url)) %> <br />
+    <%= (content_tag('strong', _('Original content') + ': ') + link_to(article.title || url_for(article.url), article.url)) %> <br />
     <%= content_tag('small', _('This link might be unavailable if the content is removed')) %>
   </li>
 </ul>
 
-<p><%= article_to_html(comment) %></p>
+<p>"<%= article.body %>"</p>



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/15d3a92b180bf71e1620937a75e44ea29f8e9626

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/15d3a92b180bf71e1620937a75e44ea29f8e9626
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180125/583517ec/attachment.html>