Merge branch 'stable'

Conflicts: app/controllers/my_profile/profile_themes_controller.rb test/unit/comment_test.rb vendor/plugins/action_tracker_has_comments/init.rb

Merge branch 'stable'
Conflicts: app/controllers/my_profile/profile_themes_controller.rb test/unit/comment_test.rb vendor/plugins/action_tracker_has_comments/init.rb
Daniela Feitosa
2 parents abdf6fab 49e6135e
Showing 34 changed files with 280 additions and 154 deletions Show diff stats
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/helpers/boxes_helper.rb
app/models/box.rb
app/models/environment.rb
app/views/blocks/location.html.erb
debian/changelog
lib/noosfero.rb
lib/noosfero/core_ext.rb
lib/noosfero/core_ext/array.rb
lib/noosfero/plugin/routes.rb
plugins/container_block/lib/container_block_plugin.rb
plugins/container_block/lib/container_block_plugin/container_block.rb
plugins/container_block/public/container_block.js
plugins/container_block/public/style.css
plugins/container_block/test/functional/container_block_home_controller_test.rb
plugins/container_block/test/unit/block_test.rb
plugins/container_block/test/unit/container_block_plugin/container_block_test.rb
plugins/container_block/test/unit/environment_test.rb
@@ -7,7 +7,7 @@ class UsersController &lt; AdminController
   include UsersHelper
   def index
-    @filter = params[:filter]
+    @filter = params[:filter] || 'all_users'
     scope = environment.people.no_templates
     if @filter == 'admin_users'
       scope = scope.admins
@@ -16,6 +16,7 @@ class UsersController &lt; AdminController
     elsif @filter == 'deactivated_users'
       scope = scope.deactivated
     end
+    scope = scope.order('name ASC')
     @q = params[:q]
     @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
   end
@@ -21,6 +21,7 @@ class ApplicationController &lt; ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
+    return nil if request.format == :js
     theme_layout = theme_option(:layout)
     if theme_layout
       theme_view_file('layouts/'+theme_layout) || theme_layout
@@ -70,7 +70,7 @@ class BoxOrganizerController &lt; ApplicationController
     else
       @center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
       @side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
-      @boxes = boxes_holder.boxes
+      @boxes = boxes_holder.boxes.with_position
       render :action => 'add_block', :layout => false
     end
   end
@@ -39,7 +39,7 @@ module BoxesHelper
   end
   def display_boxes(holder, main_content)
-    boxes = holder.boxes.first(holder.boxes_limit)
+    boxes = holder.boxes.with_position.first(holder.boxes_limit)
     content = boxes.reverse.map { |item| display_box(item, main_content) }.join("\n")
     content = main_content if (content.blank?)
@@ -5,6 +5,8 @@ class Box &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
+  named_scope :with_position, :conditions => ['boxes.position > 0']
+
   def environment
     owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
   end
@@ -186,7 +186,7 @@ class Environment &lt; ActiveRecord::Base
   has_many :product_categories, :conditions => { :type => 'ProductCategory'}
   has_many :regions
-  has_many :roles
+  has_many :roles, :dependent => :destroy
   has_many :qualifiers
   has_many :certifiers
@@ -3,7 +3,6 @@
   <div class='the-localization-map'>
     <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
   </div>
-</div>
 <% else %>
   <i><%= _('This profile has no geographical position registered.') %></i>
 <% end %>
+noosfero (0.46.1) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Fri, 07 Mar 2014 10:33:11 +0000
+
 noosfero (0.46.0) unstable; urgency=low
   * New features release
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.46.0'
+  VERSION = '0.46.1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
 require 'noosfero/core_ext/string'
 require 'noosfero/core_ext/integer'
+require 'noosfero/core_ext/array'
 require 'noosfero/core_ext/object'
 require 'noosfero/core_ext/active_record'
@@ -0,0 +1,9 @@
+class Array
+
+  def uniq_by
+    hash, array = {}, []
+    each { |i| hash[yield(i)] ||= (array << i) }
+    array
+  end
+
+end
@@ -15,12 +15,16 @@ Dir.glob(File.join(Rails.root, plugins_root, &#39;*&#39;, &#39;controllers&#39;)) do |controller
   controllers_by_folder.each do |folder, controllers|
     controllers.each do |controller|
       controller_name = controller.gsub("#{plugin_name}_plugin_",'')
-      map.connect "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}/:action/:id", :controller => controller
+      if %w[profile myprofile].include?(folder)
+        map.connect "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}/:action/:id", :controller => controller, :profile => /#{Noosfero.identifier_format}/
+      else
+        map.connect "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}/:action/:id", :controller => controller
+      end
     end
   end
   map.connect 'plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin'
-  map.connect 'profile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_profile'
-  map.connect 'myprofile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_myprofile'
+  map.connect 'profile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_profile', :profile => /#{Noosfero.identifier_format}/
+  map.connect 'myprofile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_myprofile', :profile => /#{Noosfero.identifier_format}/
   map.connect 'admin/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_admin'
 end
@@ -16,4 +16,8 @@ class ContainerBlockPlugin &lt; Noosfero::Plugin
     true
   end
+  def js_files
+    'container_block.js'
+  end
+
 end
@@ -7,6 +7,16 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   settings_items :container_box_id, :type => Integer, :default => nil
   settings_items :children_settings, :type => Hash, :default => {}
+  validate :no_cyclical_reference, :if => 'container_box_id.present?'
+
+  def no_cyclical_reference
+    errors.add(:box_id, _('cyclical reference is not allowed.')) if box_id == container_box_id
+  end
+
+  before_save do |b|
+    raise "cyclical reference is not allowed" if b.box_id == b.container_box_id && !b.container_box_id.blank?
+  end
+
   def self.description
     _('Container')
   end
@@ -15,6 +25,10 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
     _('This block acts as a container for another blocks')
   end
+  def cacheable?
+    false
+  end
+
   def layout_template
     nil
   end
@@ -24,8 +38,9 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   end
   def create_box
-    box = Box.create!(:owner => owner)
-    settings[:container_box_id] = box.id
+    container_box = Box.create!(:owner => owner)
+    container_box.update_attribute(:position, nil)
+    settings[:container_box_id] = container_box.id
     save!
   end
@@ -0,0 +1,28 @@
+function enableMoveContainerChildren(container, box) {
+  var div = jQuery('#box-'+box+' > .block-outer > .block');
+  if(!div.is('.ui-resizable')) {
+    div.resizable({
+      handles: 'e, w',
+      containment: '#block-'+container+' .block-inner-2',
+      resize: function( event, ui ) {
+        ui.element.height('auto');
+      }
+    });
+  }
+}
+
+function disableMoveContainerChildren(container, box) {
+  var div = jQuery('#box-'+box+' > .block-outer > .block');
+  if(div.is('.ui-resizable')) {
+    div.resizable('destroy');
+  }
+}
+
+function containerChildrenWidth(container, box) {
+  widths = "";
+  jQuery('#box-'+box+' > .block-outer > .block').each(function(i) {
+    childId = jQuery(this).attr('id').match(/block-(\d+)/)[1];
+    widths+=childId+","+jQuery(this).width()+"|";
+  });
+  return "widths="+widths;
+}
+#box-organizer .container-block-plugin_container-block > .block-inner-1 > .block-inner-2 > .button-bar {
+  height: 22px;
+  padding-bottom: 0px;
+  width: auto;
+}
+
 #content .boxes .container-block-plugin_container-block .container_block_child, .container-block-plugin_container-block .block-outer {
   display: inline-block;
   vertical-align: top;
@@ -17,14 +23,10 @@
   background-image: url(/designs/icons/default/Tango/16x16/actions/go-previous.png);
 }
-#content .boxes .container-block-plugin_container-block .block {
-  outline-offset: -2px;
-}
-
 #content .boxes .container-block-plugin_container-block .block .ui-resizable-handle {
   width: 10px;
   height: 28px;
-  z-index: 0;
+  z-index: 1000;
 }
 #content .boxes .container-block-plugin_container-block .block .ui-resizable-e {
@@ -37,6 +39,21 @@
   background-image: url(/plugins/container_block/images/handle_w.png);
 }
-.container-block-plugin_container-block .button-bar .icon-resize {
+.container-block-plugin_container-block .container-block-button-bar .icon-resize {
   background-image: url(/designs/icons/default/Tango/16x16/actions/view-fullscreen.png);
 }
+
+#box-organizer .block .container-block-button-bar {
+  right: 0px;
+  bottom: 0px;
+  height: auto;
+}
+
+#box-organizer .container-block-plugin_container-block:hover .block {
+  outline: 1px dashed black;
+  outline-offset: -1px;
+}
+
+.container-block-plugin_container-block .block-target {
+  background: #afd;
+}
@@ -31,6 +31,13 @@ class HomeControllerTest &lt; ActionController::TestCase
     assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }
   end
+  should 'display block title' do
+    @block.title = "Block Title"
+    @block.save!
+    get :index
+    assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }, :descendant => {:tag => 'h3', :attributes => { :class => "block-title"}, :content => @block.title }
+  end
+
   should 'display container children' do
     c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
     c2 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child2 content')
@@ -1,31 +0,0 @@
-require 'test_helper'
-
-class BlockTest < ActiveSupport::TestCase
-
-  def setup
-    @environment = fast_create(Environment)
-    @box = Box.create!(:owner => @environment)
-    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
-  end
-
-  should 'return environment box if block owner is not a ContainerBlock' do
-    block = Block.create!(:box => @box)
-    assert_equal @box, block.box
-  end
-
-  should 'return container box if block owner is a ContainerBlock' do
-    block = Block.create!(:box => @container.container_box)
-    assert_equal @container.container_box, block.box
-  end
-
-  should 'return block owner if block onwer is not a ContainerBlock' do
-    block = Block.create!(:box => @box)
-    assert_equal @environment, block.owner
-  end
-
-  should 'return environment as owner if block onwer is a ContainerBlock' do
-    block = Block.create!(:box => @container.container_box)
-    assert_equal @environment, block.owner
-  end
-
-end
@@ -20,6 +20,11 @@ class ContainerBlockPlugin::ContainerBlockTest &lt; ActiveSupport::TestCase
     assert @block.container_box_id
   end
+  should 'created box should have nil as position' do
+    @block.save!
+    assert_equal nil, @block.container_box.position
+  end
+
   should 'return created box' do
     @block.save!
     assert @block.container_box
@@ -89,4 +94,27 @@ class ContainerBlockPlugin::ContainerBlockTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'not mess up with boxes positions when destroyed' do
+    env = fast_create(Environment)
+    box1 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 1)
+    box2 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 2)
+    box3 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 3)
+    block = ContainerBlockPlugin::ContainerBlock.create!(:box => box1)
+    block.destroy
+    assert_equal [1, 2, 3], [box1.reload.position, box2.reload.position, box3.reload.position]
+  end
+
+  should 'be able to change box' do
+    @block.save!
+    @block.box = Box.new(:owner => Environment.default)
+    @block.save!
+  end
+
+  should 'not able to change box to be the same as container_box' do
+    @block.save!
+    @block.box = @block.container_box
+    @block.save
+    assert @block.errors.invalid?(:box_id)
+  end
+
 end
@@ -1,32 +0,0 @@
-require 'test_helper'
-
-class EnvironmentTest < ActiveSupport::TestCase
-
-  def setup
-    @environment = fast_create(Environment)
-
-    @box = Box.create!(:owner => @environment)
-    @block = Block.create!(:box => @box)
-
-    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
-  end
-
-  should 'return blocks as usual' do
-    assert_equal [@block, @container], @environment.blocks
-  end
-
-  should 'return blocks with container children' do
-    child = Block.create!(:box => @container.container_box)
-    assert_equal [@block, @container, child], @environment.blocks
-  end
-
-  should 'return block with id at find method' do
-    assert_equal @block, @environment.blocks.find(@block.id)
-  end
-
-  should 'return child block with id at find method' do
-    child = Block.create!(:box => @container.container_box)
-    assert_equal child, @environment.blocks.find(child.id)
-  end
-
-end
@@ -1,32 +0,0 @@
-require 'test_helper'
-
-class ProfileTest < ActiveSupport::TestCase
-
-  def setup
-    @profile = fast_create(Profile)
-
-    @box = Box.create!(:owner => @profile)
-    @block = Block.create!(:box => @box)
-
-    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
-  end
-
-  should 'return blocks as usual' do
-    assert_equal [@block, @container], @profile.blocks
-  end
-
-  should 'return blocks with container children' do
-    child = Block.create!(:box => @container.container_box)
-    assert_equal [@block, @container, child], @profile.blocks
-  end
-
-  should 'return block with id at find method' do
-    assert_equal @block, @profile.blocks.find(@block.id)
-  end
-
-  should 'return child block with id at find method' do
-    child = Block.create!(:box => @container.container_box)
-    assert_equal child, @profile.blocks.find(child.id)
-  end
-
-end
 <% edit_mode = @controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?) %>
 <% box_decorator = edit_mode ? self : BoxesHelper::DontMoveBlocks %>
+<%= block_title(block.title) %>
 <div class="box" id="box-<%= block.container_box.id %>">
   <%= display_box_content(block.container_box, nil) %>
@@ -15,8 +16,18 @@
 </style>
 <% if edit_mode %>
-  <div class="button-bar">
-    <a href="#" onclick="toggleMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>); return false;" class="button icon-resize" title=<%= _('Resize blocks').to_json %>></a>
+
+  <script>
+    jQuery("#block-<%= block.id %>").hover(
+      function() {
+        enableMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>);
+      }, function() {
+        disableMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>);
+      }
+    );
+  </script>
+
+  <div class="container-block-button-bar button-bar">
     <%= link_to_remote '', :url => { :controller => @controller.boxes_holder.kind_of?(Environment) ? 'container_block_plugin_admin' : 'container_block_plugin_myprofile', :action => 'saveWidths', :id => block.id }, 
                            :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})", 
     :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => _('Save') },
@@ -24,37 +35,4 @@
                            :loaded => "close_loading();",
                            :complete => "display_notice(request.responseText);"%>
   </div>
-
-  <script>
-    function toggleMoveContainerChildren(container, box) {
-      var div = jQuery('#box-'+box+' > .block-outer > .block');
-      var targetDiv = jQuery('#box-'+box+' .block-outer .block-target');
-      if(div.is('.ui-resizable')) {
-        targetDiv.show();
-        div.find("a").die("click");
-        div.resizable('destroy');
-      } else {
-        targetDiv.hide();
-        div.find("a").live("click", function(e) {
-          e.preventDefault();
-        });
-        div.resizable({
-          handles: 'e, w',
-          containment: '#block-'+container+' .block-inner-2',
-          resize: function( event, ui ) {
-            ui.element.height('auto');
-          }
-        });
-      }
-    }
-
-    function containerChildrenWidth(container, box) {
-      widths = "";
-      jQuery('#box-'+box+' > .block-outer > .block').each(function(i) { 
-        childId = jQuery(this).attr('id').match(/block-(\d+)/)[1];
-        widths+=childId+","+jQuery(this).width()+"|";
-      });
-      return "widths="+widths;
-    }
-  </script>
 <% end %>
 (function($) {
   $(window).bind('userDataLoaded', function(event, data) {
-    if (data.login || $('meta[name=profile.allow_unauthenticated_comments]').length > 0) {
+    if (data.login || $('meta[name="profile.allow_unauthenticated_comments"]').length > 0) {
       $('.post-comment-button').livequery(function() {
         $(this).show();
       });
@@ -8,7 +8,7 @@
         $(this).show();
       });
       $('.comment-footer').livequery(function() {
-        $(this).show();      
+        $(this).show();
       });
     }
   });
+/* browser fixes */
+
+img:-moz-broken {
+  -moz-force-broken-image-icon:1;
+}
+
+/* general styles */
+
 body {
   padding: 0px;
   margin: 0px;
@@ -1727,8 +1735,8 @@ a.button.disabled, input.disabled {
   display: none;
 }
-#box-organizer .block:focus .button-bar,
-#box-organizer .block:hover .button-bar {
+#box-organizer .block-outer:focus .button-bar,
+#box-organizer .block-outer:hover .button-bar {
   display: block;
 }
@@ -310,4 +310,23 @@ class ProfileThemesControllerTest &lt; ActionController::TestCase
     assert_no_tag :content => "Select theme"
   end
+  should 'not duplicate themes that are included by the user and by the environment' do
+    t1 = Theme.create('theme1')
+    t2 = Theme.create('theme2')
+    Environment.any_instance.stubs('themes').returns([t1,t2])
+    Theme.stubs(:approved_themes).returns([t2])
+
+    get :index, :profile => "testinguser"
+    assert_equivalent [t1, t2], assigns(:themes)
+  end
+
+  should 'sort themes by name' do
+    t1 = Theme.create('bill-theme')
+    t2 = Theme.create('ana-theme')
+    Theme.stubs(:approved_themes).returns([t1,t2])
+
+    get :index, :profile => "testinguser"
+    assert_equal [t2, t1], assigns(:themes)
+  end
+
 end
@@ -107,6 +107,21 @@ class UsersControllerTest &lt; ActionController::TestCase
     assert_equal false, u.activated?
   end
+  should 'order users by name' do
+    create_user('jeremy')
+    create_user('bill')
+    create_user('ana')
+    create_user('creed')
+    get :index
+
+    assert_order ['ana', 'bill', 'creed', 'jeremy'], assigns(:collection).map(&:name)
+  end
+
+  should 'set filter to all_users by default' do
+    get :index
+    assert_equal 'all_users', assigns(:filter)
+  end
+
   should 'response as XML to export users' do
     get :download, :format => 'xml'
     assert_equal 'text/xml', @response.content_type
@@ -177,6 +177,19 @@ class ActiveSupport::TestCase
     assert !tag, "expected no tag #{options.inspect}, but tag found in #{text.inspect}"
   end
+  def assert_order(reference, original)
+    original.each do |value|
+      if reference.include?(value)
+        if reference.first == value
+          reference.shift
+        else
+          assert false, "'#{value}' was found before it should be on: #{original.inspect}"
+        end
+      end
+    end
+    assert reference.blank?, "The following elements are not in the collection: #{reference.inspect}"
+  end
+
   # For models that render views (blocks, articles, ...)
   def render(*args)
     view_paths = @explicit_view_paths || ActionController::Base.view_paths
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# tests for Array core extension. See lib/noosfero/core_ext/array.rb
+class StringCoreExtTest < ActiveSupport::TestCase
+
+  should 'allow uniq by a block' do
+    array = [0,1,2,3,4,5,6]
+    assert_equal [0,1], array.uniq_by {|number| number%2 }
+  end
+
+end
@@ -140,4 +140,11 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert !blocks.include?('box-test_plugin-block')
   end
+  should 'list only boxes with a postion greater than zero' do
+    profile = fast_create(Profile)
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => 'Profile', :position => 0)
+    box2 = fast_create(Box, :owner_id => profile.id, :owner_type => 'Profile', :position => 1)
+    assert_equal [box2], profile.boxes.with_position
+  end
+
 end
@@ -13,7 +13,8 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
   should 'include profile-specific header' do
     holder = mock
-    holder.stubs(:boxes).returns([])
+    holder.stubs(:boxes).returns(boxes = [])
+    boxes.stubs(:with_position).returns([])
     holder.stubs(:boxes_limit).returns(0)
     holder.stubs(:custom_header_expanded).returns('my custom header')
     @controller.stubs(:boxes_holder).returns(holder)
@@ -23,7 +24,8 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
   should 'include profile-specific footer' do
     holder = mock
-    holder.stubs(:boxes).returns([])
+    holder.stubs(:boxes).returns(boxes = [])
+    boxes.stubs(:with_position).returns([])
     holder.stubs(:boxes_limit).returns(0)
     holder.stubs(:custom_footer_expanded).returns('my custom footer')
     @controller.stubs(:boxes_holder).returns(holder)
@@ -285,6 +285,37 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_equal [c1,c3], c.reload.children
   end
+  should "return activities comments as a thread" do
+    person = fast_create(Person)
+    a = TextileArticle.create!(:profile => person, :name => 'My article', :body => 'Article body')
+    c0 = Comment.create!(:source => a, :body => 'My comment', :author => person)
+    c1 = Comment.create!(:reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
+    c2 = Comment.create!(:reply_of_id => c1.id, :source => a, :body => 'bla', :author => person)
+    c3 = Comment.create!(:reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
+    c4 = Comment.create!(:source => a, :body => 'My comment', :author => person)
+    result = a.activity.comments
+    assert_equal c0, result[0]
+    assert_equal [c1, c3], result[0].replies
+    assert_equal [c2], result[0].replies[0].replies
+    assert_equal c4, result[1]
+    assert result[1].replies.empty?
+  end
+
+  should "return activities comments when some comment on thread is spam and not display its replies" do
+    person = fast_create(Person)
+    a = TextileArticle.create!(:profile => person, :name => 'My article', :body => 'Article body')
+    c0 = Comment.create(:source => a, :body => 'Root comment', :author => person)
+    c1 = Comment.create(:reply_of_id => c0.id, :source => a, :body => 'c1', :author => person)
+    c2 = Comment.create(:source => a, :body => 'c2', :author => person)
+    spam = Comment.create(:spam => true, :reply_of_id => c2.id, :source => a, :body => 'spam', :author => person)
+    spam_reply = Comment.create(:reply_of_id => spam.id, :source => a, :body => 'spam reply', :author => person)
+    result = a.activity.comments
+    assert_equal c0, result[0]
+    assert_equal [c1], result[0].replies.without_spam
+    assert_equal c2, result[1]
+    assert_equal [], result[1].replies.without_spam
+  end
+
   should 'provide author url for authenticated user' do
     author = Person.new
     author.expects(:url).returns('http://blabla.net/author')
@@ -389,6 +420,7 @@ class CommentTest &lt; ActiveSupport::TestCase
   end
   should 'be able to select non-spam comments' do
+    Comment.destroy_all
     c1 = fast_create(Comment)
     c2 = fast_create(Comment, :spam => false)
     c3 = fast_create(Comment, :spam => true)
@@ -660,6 +692,7 @@ class CommentTest &lt; ActiveSupport::TestCase
   end
   should 'be able to select non-reply comments' do
+    Comment.destroy_all
     c1 = fast_create(Comment)
     c2 = fast_create(Comment, :reply_of_id => c1.id)
     c3 = fast_create(Comment, :reply_of_id => c2.id)
@@ -783,6 +783,18 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert role2.valid?
   end
+  should 'destroy roles when its environment is destroyed' do
+    e1 = fast_create(Environment)
+    role1 = Role.create!(:name => 'test_role', :environment => e1, :key => 'a_member')
+    e2 = fast_create(Environment)
+    role2 = Role.create!(:name => 'test_role', :environment => e2, :key => 'a_member')
+
+    e2.destroy
+
+    assert_nothing_raised {Role.find(role1.id)}
+    assert_raise(ActiveRecord::RecordNotFound) {Role.find(role2.id)}
+  end
+
   should 'have a help_message_to_add_enterprise attribute' do
     env = Environment.new
@@ -1461,7 +1461,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'list events by month' do
     profile = fast_create(Profile)
-    today = Date.today
+    today = Date.new(2014, 03, 2)
     yesterday_event = Event.new(:name => 'Joao Birthday', :start_date => today - 1.day)
     today_event = Event.new(:name => 'Ze Birthday', :start_date => today)
     tomorrow_event = Event.new(:name => 'Mane Birthday', :start_date => today + 1.day)
@@ -11,5 +11,6 @@ Rails.configuration.to_prepare do
       type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id])
       "source_type = '#{type}' AND source_id = '#{id}' AND spam IS NOT TRUE AND reply_of_id IS NULL"
     end
+
   end
 end
	@@ -70,7 +70,7 @@ class BoxOrganizerController < ApplicationController		@@ -70,7 +70,7 @@ class BoxOrganizerController < ApplicationController
70	else	70	else
71	@center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)	71	@center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
72	@side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])	72	@side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
73	- @boxes = boxes_holder.boxes	73	+ @boxes = boxes_holder.boxes.with_position
74	render :action => 'add_block', :layout => false	74	render :action => 'add_block', :layout => false
75	end	75	end
76	end	76	end
	@@ -39,7 +39,7 @@ module BoxesHelper		@@ -39,7 +39,7 @@ module BoxesHelper
39	end	39	end
40		40
41	def display_boxes(holder, main_content)	41	def display_boxes(holder, main_content)
42	- boxes = holder.boxes.first(holder.boxes_limit)	42	+ boxes = holder.boxes.with_position.first(holder.boxes_limit)
43	content = boxes.reverse.map { \|item\| display_box(item, main_content) }.join("\n")	43	content = boxes.reverse.map { \|item\| display_box(item, main_content) }.join("\n")
44	content = main_content if (content.blank?)	44	content = main_content if (content.blank?)
45		45
	@@ -5,6 +5,8 @@ class Box < ActiveRecord::Base		@@ -5,6 +5,8 @@ class Box < ActiveRecord::Base
5		5
6	include Noosfero::Plugin::HotSpot	6	include Noosfero::Plugin::HotSpot
7		7
		8	+ named_scope :with_position, :conditions => ['boxes.position > 0']
		9	+
8	def environment	10	def environment
9	owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil	11	owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
10	end	12	end
	@@ -186,7 +186,7 @@ class Environment < ActiveRecord::Base		@@ -186,7 +186,7 @@ class Environment < ActiveRecord::Base
186	has_many :product_categories, :conditions => { :type => 'ProductCategory'}	186	has_many :product_categories, :conditions => { :type => 'ProductCategory'}
187	has_many :regions	187	has_many :regions
188		188
189	- has_many :roles	189	+ has_many :roles, :dependent => :destroy
190		190
191	has_many :qualifiers	191	has_many :qualifiers
192	has_many :certifiers	192	has_many :certifiers
		1	+noosfero (0.46.1) unstable; urgency=low
		2	+
		3	+ * Bugfixes release
		4	+
		5	+ -- Daniela Soares Feitosa <daniela@colivre.coop.br> Fri, 07 Mar 2014 10:33:11 +0000
		6	+
1	noosfero (0.46.0) unstable; urgency=low	7	noosfero (0.46.0) unstable; urgency=low
2		8
3	* New features release	9	* New features release
	@@ -3,7 +3,7 @@ require 'fast_gettext'		@@ -3,7 +3,7 @@ require 'fast_gettext'
3		3
4	module Noosfero	4	module Noosfero
5	PROJECT = 'noosfero'	5	PROJECT = 'noosfero'
6	- VERSION = '0.46.0'	6	+ VERSION = '0.46.1'
7		7
8	def self.pattern_for_controllers_in_directory(dir)	8	def self.pattern_for_controllers_in_directory(dir)
9	disjunction = controllers_in_directory(dir).join('\|')	9	disjunction = controllers_in_directory(dir).join('\|')
1	require 'noosfero/core_ext/string'	1	require 'noosfero/core_ext/string'
2	require 'noosfero/core_ext/integer'	2	require 'noosfero/core_ext/integer'
		3	+require 'noosfero/core_ext/array'
3	require 'noosfero/core_ext/object'	4	require 'noosfero/core_ext/object'
4	require 'noosfero/core_ext/active_record'	5	require 'noosfero/core_ext/active_record'
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class Array
	2	+
	3	+ def uniq_by
	4	+ hash, array = {}, []
	5	+ each { \|i\| hash[yield(i)] \|\|= (array << i) }
	6	+ array
	7	+ end
	8	+
	9	+end
	@@ -16,4 +16,8 @@ class ContainerBlockPlugin < Noosfero::Plugin		@@ -16,4 +16,8 @@ class ContainerBlockPlugin < Noosfero::Plugin
16	true	16	true
17	end	17	end
18		18
		19	+ def js_files
		20	+ 'container_block.js'
		21	+ end
		22	+
19	end	23	end
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+function enableMoveContainerChildren(container, box) {
	2	+ var div = jQuery('#box-'+box+' > .block-outer > .block');
	3	+ if(!div.is('.ui-resizable')) {
	4	+ div.resizable({
	5	+ handles: 'e, w',
	6	+ containment: '#block-'+container+' .block-inner-2',
	7	+ resize: function( event, ui ) {
	8	+ ui.element.height('auto');
	9	+ }
	10	+ });
	11	+ }
	12	+}
	13	+
	14	+function disableMoveContainerChildren(container, box) {
	15	+ var div = jQuery('#box-'+box+' > .block-outer > .block');
	16	+ if(div.is('.ui-resizable')) {
	17	+ div.resizable('destroy');
	18	+ }
	19	+}
	20	+
	21	+function containerChildrenWidth(container, box) {
	22	+ widths = "";
	23	+ jQuery('#box-'+box+' > .block-outer > .block').each(function(i) {
	24	+ childId = jQuery(this).attr('id').match(/block-(\d+)/)[1];
	25	+ widths+=childId+","+jQuery(this).width()+"\|";
	26	+ });
	27	+ return "widths="+widths;
	28	+}