Download as
Browse Code »

Commit 4e618c2c293a34e819ca81cfb53ccd64f71f6521

Authored by Leandro Santos
1 parent ea29ebc4
Exists in staging and in 30 other branches all_pending_tasks_api, api-articles-period, api_roles, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention

fix html escape of article in plugin comment paragraph

Showing 2 changed files with 9 additions and 3 deletions   Show diff stats
plugins/comment_paragraph/test/functional/content_viewer_controller_test.rb
  Diff comments   View file @4e618c2
... ... @@ -26,4 +26,12 @@ class ContentViewerControllerTest < ActionController::TestCase
26 26 assert_tag 'div', :attributes => {:class => 'comment_paragraph'}
27 27 end
28 28  
  29 + should 'parse article body with correct html escape' do
  30 + comment1 = fast_create(Comment, :paragraph_uuid => 0, :source_id => page.id)
  31 + @page.body='<p><strong>inner text</strong></p>'
  32 + @page.save
  33 + get :view_page, @page.url
  34 + assert_tag 'div', :content => 'inner text', :attributes => {:class => 'comment_paragraph'}
  35 + end
  36 +
29 37 end
... ...
plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb
  Diff comments   View file @4e618c2
1 1 <div class="comment-paragraph-plugin comments" id="comment-paragraph-plugin_<%= paragraph_uuid %>" data-paragraph="<%= paragraph_uuid %>">
2   - <div class="comment_paragraph">
3   - <%= inner_html %>
4   - </div>
  2 + <div class="comment_paragraph"><%= inner_html.html_safe %></div>
5 3 <div class="side-comments-counter-container">
6 4 <div class="side-comments-counter">
7 5 <span class='comment-count-container <%= count==0 ? 'no-comments-yet':'' %>'>
... ...