[Git][noosfero/noosfero][master] 5 commits: newsletter: Fix moderation checkbox regex

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
d1261c16 by Larissa Reis at 2015-11-25T16:25:57Z
newsletter: Fix moderation checkbox regex

  regex should work regardless of the position of id in the tag

- - - - -
674b489a by Larissa Reis at 2015-11-25T16:32:24Z
newsletter: Removes header padding in moderation page

- - - - -
ea09f868 by Larissa Reis at 2015-11-25T17:10:59Z
sniffer: rails4 fix filtering of virtual attribute distance

  `sniffer_plugin_distance` is a virtual attribute of profile and seems
  like it can only be accessed by a get method call now, so I replaced a
  `[]` call by a send.

- - - - -
57c595aa by Larissa Reis at 2015-11-25T17:20:45Z
newsletter: Fix test helper import

- - - - -
0ee683a4 by Bráulio Bhavamitra at 2015-11-25T22:08:09Z
Merge branch 'plugin-bug-fixes' into 'master'

Newsletter and Sniffer plugins bug fixes

Fixes some bugs found:
- Check box in newsletter moderation task page wasn't showing up;
- Newsletter header in moderation task page wasn't exactly like the preview of the newsletter since a padding was added;
- Sniffer plugin wasn't filtering out enterprises based on distance.

See merge request !736
- - - - -


5 changed files:

- plugins/newsletter/public/style.css
- plugins/newsletter/test/functional/newsletter_plugin_admin_controller_test.rb
- plugins/newsletter/test/functional/newsletter_plugin_controller_test.rb
- plugins/newsletter/views/tasks/newsletter_plugin/_moderate_newsletter_accept_details.html.erb
- plugins/sniffer/lib/sniffer_plugin/helper.rb


Changes:

=====================================
plugins/newsletter/public/style.css
=====================================
--- a/plugins/newsletter/public/style.css
+++ b/plugins/newsletter/public/style.css
@@ -17,6 +17,11 @@
   margin-left: 10px;
 }
 
+#newsletter-moderation-preview th {
+  padding: 0px;
+  border: 0px;
+}
+
 #newsletter-moderation-preview input[type=checkbox] {
   margin-left: -27px;
   margin-top: 16px;


=====================================
plugins/newsletter/test/functional/newsletter_plugin_admin_controller_test.rb
=====================================
--- a/plugins/newsletter/test/functional/newsletter_plugin_admin_controller_test.rb
+++ b/plugins/newsletter/test/functional/newsletter_plugin_admin_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 
 class NewsletterPluginAdminControllerTest < ActionController::TestCase
 


=====================================
plugins/newsletter/test/functional/newsletter_plugin_controller_test.rb
=====================================
--- a/plugins/newsletter/test/functional/newsletter_plugin_controller_test.rb
+++ b/plugins/newsletter/test/functional/newsletter_plugin_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 
 class NewsletterPluginControllerTest < ActionController::TestCase
 


=====================================
plugins/newsletter/views/tasks/newsletter_plugin/_moderate_newsletter_accept_details.html.erb
=====================================
--- a/plugins/newsletter/views/tasks/newsletter_plugin/_moderate_newsletter_accept_details.html.erb
+++ b/plugins/newsletter/views/tasks/newsletter_plugin/_moderate_newsletter_accept_details.html.erb
@@ -3,14 +3,14 @@
 <h1><%= _('Check posts you want to include') %></h1>
 
 <div id='newsletter-moderation-preview'>
-  <% newsletter_content = newsletter.body.gsub(/width: 640px;/,'').sub(/#{NewsletterPlugin::Newsletter::CSS['breaking-news-wrap']}/, '') %>
+  <% newsletter_content = newsletter.body.gsub(/width: 640px;/,'').sub(/#{NewsletterPlugin::Newsletter::CSS['breakingnews-wrap']}/, '') %>
 
   <% newsletter.posts.each do |post| %>
     <% input_name = "tasks[#{task.id}][task][post_ids][]" %>
     <% post_check_box = hidden_field_tag(input_name, '0') +check_box_tag(input_name, post.id, true) %>
 
-    <% newsletter_content.gsub!(/<span id="#{post.id}"/, post_check_box+ '<span') %>
-    <% newsletter_content.gsub!(/<img id="#{post.id}"/, post_check_box+ '<img') %>
+    <% newsletter_content.gsub!(/<span([^>]*?) id="#{post.id}"/, post_check_box + '<span\\1')%>
+    <% newsletter_content.gsub!(/<img([^>]*?) id="#{post.id}"/, post_check_box + '<img\\1') %>
   <% end %>
 
   <%= newsletter_content %>


=====================================
plugins/sniffer/lib/sniffer_plugin/helper.rb
=====================================
--- a/plugins/sniffer/lib/sniffer_plugin/helper.rb
+++ b/plugins/sniffer/lib/sniffer_plugin/helper.rb
@@ -5,7 +5,7 @@ module SnifferPlugin::Helper
   def filter_visible_attr_profile(profile)
     filtered_profile = {}
     visible_attributes = [:id, :name, :lat, :lng, :sniffer_plugin_distance]
-    visible_attributes.each{ |a| filtered_profile[a] = profile[a] || 0 }
+    visible_attributes.each{ |a| filtered_profile[a] = profile.send(a) || 0 }
     filtered_profile
   end
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/ab48799c69148fe346c4400826993bf3be38110d...0ee683a48fef54b5a469e8a78338e1c764ce1d6c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151125/8db4d4ac/attachment.html>