1
Download as
Browse Code »

Commit d1261c16e728b749b7f1337f3eb0b7986ec1d52a

Authored by Larissa Reis
1 parent 75f13387
Exists in master and in 19 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, web_steps_improvements, xss_terminate_custom_options

newsletter: Fix moderation checkbox regex 

  regex should work regardless of the position of id in the tag
Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
plugins/newsletter/views/tasks/newsletter_plugin/_moderate_newsletter_accept_details.html.erb
  Diff comments   View file @d1261c1
... ... @@ -3,14 +3,14 @@
3 3 <h1><%= _('Check posts you want to include') %></h1>
4 4  
5 5 <div id='newsletter-moderation-preview'>
6   - <% newsletter_content = newsletter.body.gsub(/width: 640px;/,'').sub(/#{NewsletterPlugin::Newsletter::CSS['breaking-news-wrap']}/, '') %>
  6 + <% newsletter_content = newsletter.body.gsub(/width: 640px;/,'').sub(/#{NewsletterPlugin::Newsletter::CSS['breakingnews-wrap']}/, '') %>
7 7  
8 8 <% newsletter.posts.each do |post| %>
9 9 <% input_name = "tasks[#{task.id}][task][post_ids][]" %>
10 10 <% post_check_box = hidden_field_tag(input_name, '0') +check_box_tag(input_name, post.id, true) %>
11 11  
12   - <% newsletter_content.gsub!(/<span id="#{post.id}"/, post_check_box+ '<span') %>
13   - <% newsletter_content.gsub!(/<img id="#{post.id}"/, post_check_box+ '<img') %>
  12 + <% newsletter_content.gsub!(/<span([^>]*?) id="#{post.id}"/, post_check_box + '<span\\1')%>
  13 + <% newsletter_content.gsub!(/<img([^>]*?) id="#{post.id}"/, post_check_box + '<img\\1') %>
14 14 <% end %>
15 15  
16 16 <%= newsletter_content %>
... ...