Merge commit 'refs/merge-requests/181' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/181 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/models/person.rb app/views/enterprise_registration/basic_information.rhtml lib/noosfero/plugin.rb public/stylesheets/application.css test/unit/person_test.rb test/unit/profile_test.rb

Merge commit 'refs/merge-requests/181' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/181 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/models/person.rb app/views/enterprise_registration/basic_information.rhtml lib/noosfero/plugin.rb public/stylesheets/application.css test/unit/person_test.rb test/unit/profile_test.rb
Daniela Feitosa
2 parents a1ac0fb5 fd9a3c23
Showing 39 changed files with 1096 additions and 70 deletions Show diff stats
app/controllers/application_controller.rb
app/helpers/application_helper.rb
app/models/person.rb
app/models/profile.rb
app/models/profile_list_block.rb
app/views/enterprise_registration/basic_information.rhtml
app/views/memberships/index.rhtml
app/views/memberships/new_community.rhtml
app/views/shared/_list_groups.html.erb
config/initializers/plugins.rb
lib/noosfero/plugin.rb
lib/noosfero/plugin/acts_as_having_hotspots.rb
lib/noosfero/plugin/context.rb
lib/noosfero/plugin/manager.rb
plugins/sub_organizations/controllers/sub_organizations_plugin_myprofile_controller.rb
plugins/sub_organizations/db/migrate/20120530173629_create_relation.rb
plugins/sub_organizations/db/migrate/20120615202224_approve_paternity_relation.rb
plugins/sub_organizations/lib/sub_organizations_plugin.rb
plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity.rb
plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb
 class ApplicationController < ActionController::Base
  
   before_filter :setup_multitenancy
+  before_filter :detect_stuff_by_domain
+  before_filter :init_noosfero_plugins
  
   include ApplicationHelper
   layout :get_layout
@@ -51,8 +53,6 @@ class ApplicationController &lt; ActionController::Base
  
   include NeedsProfile
  
-  before_filter :detect_stuff_by_domain
-  before_filter :init_noosfero_plugins
   attr_reader :environment
  
   before_filter :load_terminology
@@ -1352,4 +1352,53 @@ module ApplicationHelper
       :style => 'margin-top: 1em'
     )
   end
+
+  def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
+    options[:min_chars] ||= 3
+    options[:hint_text] ||= _("Type in a search term")
+    options[:no_results_text] ||= _("No results")
+    options[:searching_text] ||= _("Searching...")
+    options[:search_delay] ||= 1000
+    options[:prevent_duplicates] ||=  true
+    options[:backspace_delete_item] ||= false
+    options[:focus] ||= false
+    options[:avoid_enter] ||= true
+    options[:on_result] ||= 'null'
+    options[:on_add] ||= 'null'
+    options[:on_delete] ||= 'null'
+    options[:on_ready] ||= 'null'
+
+    result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
+    result +=
+    "
+    <script type='text/javascript'>
+      jQuery('##{element_id}')
+      .tokenInput('#{url_for(search_action)}', {
+        minChars: #{options[:min_chars].to_json},
+        prePopulate: #{options[:pre_populate].to_json},
+        hintText: #{options[:hint_text].to_json},
+        noResultsText: #{options[:no_results_text].to_json},
+        searchingText: #{options[:searching_text].to_json},
+        searchDelay: #{options[:serach_delay].to_json},
+        preventDuplicates: #{options[:prevent_duplicates].to_json},
+        backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
+        queryParam: #{name.to_json},
+        tokenLimit: #{options[:token_limit].to_json},
+        onResult: #{options[:on_result]},
+        onAdd: #{options[:on_add]},
+        onDelete: #{options[:on_delete]},
+        onReady: #{options[:on_ready]},
+      })
+    "
+    result += options[:focus] ? ".focus();" : ";"
+    if options[:avoid_enter]
+      result += "jQuery('#token-input-#{element_id}')
+                    .live('keydown', function(event){
+                    if(event.keyCode == '13') return false;
+                  });"
+    end
+    result += "</script>"
+    result
+  end
+
 end
@@ -22,7 +22,22 @@ class Person &lt; Profile
     super
   end
  
-  named_scope :members_of, lambda { |resource| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.resource_type = ? AND role_assignments.resource_id = ?', resource.class.base_class.name, resource.id ] } }
+  acts_as_having_hotspots
+
+  named_scope :members_of, lambda { |resources|
+    resources = [resources] if !resources.kind_of?(Array)
+    conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
+    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
+  }
+
+  def has_permission_with_plugins?(permission, profile)
+    permissions = [has_permission_without_plugins?(permission, profile)]
+    permissions += enabled_plugins.map do |plugin|
+      plugin.has_permission?(self, permission, profile)
+    end
+    permissions.include?(true)
+  end
+  alias_method_chain :has_permission?, :plugins
  
   def memberships
     Profile.memberships_of(self)
@@ -60,6 +60,7 @@ class Profile &lt; ActiveRecord::Base
   }
  
   acts_as_accessible
+  acts_as_having_hotspots
  
   named_scope :memberships_of, lambda { |person| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id ] } }
   #FIXME: these will work only if the subclass is already loaded
@@ -68,13 +69,24 @@ class Profile &lt; ActiveRecord::Base
   named_scope :templates, :conditions => {:is_template => true}
  
   def members
-    Person.members_of(self)
+    scopes = dispatch_scopes(:organization_members, self)
+    scopes << Person.members_of(self)
+    scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
   end
  
   def members_count
-    members.count('DISTINCT(profiles.id)')
+    members.count
   end
  
+  class << self
+    def count_with_distinct(*args)
+      options = args.last || {}
+      count_without_distinct(:id, {:distinct => true}.merge(options))
+    end
+    alias_method_chain :count, :distinct
+  end
+
+
   def members_by_role(role)
     Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', role.id])
   end
@@ -25,7 +25,7 @@ class ProfileListBlock &lt; Block
   end
  
   def profile_count
-    profiles.visible.count('DISTINCT(profiles.id)')
+    profiles.visible.count
   end
  
   # the title of the block. Probably will be overriden in subclasses.
@@ -28,6 +28,12 @@
       <%= hidden_field_tag  'create_enterprise[target_id]', environment.id %>
     <% end %>
  
+    <% @plugins.dispatch(:enterprise_registration_hidden_fields).each do |field| %>
+      <% field.each do |key, value| %>
+        <%= f.hidden_field(key, :value => value) %>
+      <% end %>
+    <% end %>
+
     <%= template_options(Enterprise, 'create_enterprise')%>
  
     <% button_bar do %>
@@ -8,30 +8,6 @@
   <%= button :back, _('Go back'), :controller => 'profile_editor' %>
 <% end %>
  
-<ul>
-<% for membership in @memberships %>
-  <li>
-    <div class='common-profile-list-block'>
-      <%= profile_image_link(membership, :portrait, 'div') %>
-    </div>
-    <span class='profile-details'>
-      <strong><%= membership.name %></strong><br/>
-      <%= _('Role: %s') % rolename_for(profile, membership) %> <br/>
-      <%= _('Type: %s') % getterm(membership.class.identification) %> <br/>
-      <%= _('Description: %s') % membership.description  + '<br/>' if membership.community? %>
-      <%= _('Members: %s') % membership.members_count.to_s %> <br/>
-      <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
-      <% button_bar do %>
-        <%= button 'menu-ctrl-panel', _('Control panel of this group'), membership.admin_url %>
-        <%= button 'menu-logout', _('Leave community'), membership.leave_url(true), :class => 'leave-community' %>
-        <% if (membership.community? && user.has_permission?(:destroy_profile, membership)) %>
-          <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => membership.identifier } %>
-        <% end %>
-      <% end %>
-    </span>
-    <br class="may-clear" />
-  </li>
-<% end %>
-</ul>
+<%= render :partial => 'shared/list_groups', :locals => {:groups => @memberships} %>
  
 </div>
@@ -16,6 +16,12 @@
  
   <%= required f.text_field(:name) %>
  
+  <% @plugins.dispatch(:new_community_hidden_fields).each do |field| %>
+    <% field.each do |key, value| %>
+      <%= f.hidden_field(key, :value => value) %>
+    <% end %>
+  <% end %>
+
   <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community } %>
  
   <% f.fields_for :image_builder, @community.image do |i| %>
@@ -0,0 +1,26 @@
+<ul id="groups-list">
+<% for group in groups %>
+  <li>
+    <div class='common-profile-list-block'>
+      <%= profile_image_link(group, :portrait, 'div') %>
+    </div>
+    <span class='profile-details'>
+      <strong><%= group.name %></strong><br/>
+      <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
+      <%= _('Type: %s') % getterm(group.class.identification) %> <br/>
+      <%= _('Description: %s') % group.description  + '<br/>' if group.community? %>
+      <%= _('Members: %s') % group.members_count.to_s %> <br/>
+      <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
+      <% button_bar do %>
+        <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
+        <%= button 'menu-logout', _('Leave community'), group.leave_url(true), :class => 'leave-community' %>
+        <% if (group.community? && user.has_permission?(:destroy_profile, group)) %>
+          <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => group.identifier } %>
+        <% end %>
+      <% end %>
+    </span>
+    <br class="may-clear" />
+  </li>
+<% end %>
+</ul>
+
 require 'noosfero/plugin'
+require 'noosfero/plugin/acts_as_having_hotspots'
 require 'noosfero/plugin/manager'
 require 'noosfero/plugin/context'
 require 'noosfero/plugin/active_record'
@@ -256,4 +256,29 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Extends organization list of members
+  # returns = An instance of ActiveRecord::NamedScope::Scope retrieved through
+  # Person.members_of method.
+  def organization_members(organization)
+    nil
+  end
+
+  # -> Extends person permission access
+  # returns = boolean
+  def has_permission?(person, permission, target)
+    nil
+  end
+
+  # -> Adds hidden_fields to the new community view
+  # returns = {key => value}
+  def new_community_hidden_fields
+    nil
+  end
+
+  # -> Adds hidden_fields to the enterprise registration view
+  # returns = {key => value}
+  def enterprise_registration_hidden_fields
+    nil
+  end
+
 end
@@ -0,0 +1,44 @@
+module ActsAsHavingHotspots
+  module ClassMethods
+    # Adding this feature to a class demands that it defines an instance method
+    # 'environment' that returns the environment associated with the instance.
+    def acts_as_having_hotspots
+      send :include, InstanceMethods
+    end
+
+    module InstanceMethods
+      # Dispatches +event+ to each enabled plugin and collect the results.
+      #
+      # Returns an Array containing the objects returned by the event method in
+      # each plugin. This array is compacted (i.e. nils are removed) and flattened
+      # (i.e. elements of arrays are added to the resulting array). For example, if
+      # the enabled plugins return 1, 0, nil, and [1,2,3], then this method will
+      # return [1,0,1,2,3]
+      #
+      def dispatch(event, *args)
+        enabled_plugins.map { |plugin| plugin.send(event, *args) }.compact.flatten
+      end
+
+      # Dispatch without flatten since scopes are executed if you run flatten on them
+      def dispatch_scopes(event, *args)
+        enabled_plugins.map { |plugin| plugin.send(event, *args) }.compact
+      end
+
+      def enabled_plugins
+        Thread.current[:enabled_plugins] ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin_name|
+          plugin = plugin_name.constantize.new
+          plugin.context = context
+          plugin
+        end
+      end
+
+      if !method_defined?(:context)
+        define_method(:context) do
+          Noosfero::Plugin::Context.new
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send(:extend, ActsAsHavingHotspots::ClassMethods)
@@ -2,7 +2,7 @@
 # controller that can be accessed by plugins
 class Noosfero::Plugin::Context
  
-  def initialize(controller)
+  def initialize(controller = ApplicationController.new)
     @controller = controller
   end
  
 class Noosfero::Plugin::Manager
  
-  attr_reader :context
+  extend ActsAsHavingHotspots::ClassMethods
+  acts_as_having_hotspots
  
-  def initialize(controller)
-    @context = Noosfero::Plugin::Context.new(controller)
-  end
+  attr_reader :context
  
+  delegate :environment, :to => :context
   delegate :each, :to => :enabled_plugins
   include Enumerable
  
-  # Dispatches +event+ to each enabled plugin and collect the results.
-  #
-  # Returns an Array containing the objects returned by the event method in
-  # each plugin. This array is compacted (i.e. nils are removed) and flattened
-  # (i.e. elements of arrays are added to the resulting array). For example, if
-  # the enabled plugins return 1, 0, nil, and [1,2,3], then this method will
-  # return [1,0,1,2,3]
-  #
-  def dispatch(event, *args)
-    map { |plugin| plugin.send(event, *args) }.compact.flatten
-  end
-
-  def enabled_plugins
-    @enabled_plugins ||= (Noosfero::Plugin.all & context.environment.enabled_plugins).map do |plugin|
-      p = plugin.constantize.new
-      p.context = context
-      p
+  def initialize(controller)
+    @context = Noosfero::Plugin::Context.new(controller)
+    Thread.current[:enabled_plugins] = (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin_name|
+      plugin = plugin_name.constantize.new
+      plugin.context = context
+      plugin
     end
   end
  
@@ -0,0 +1,53 @@
+class SubOrganizationsPluginMyprofileController < MyProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  before_filter :organizations_only
+
+  def index
+    @children = SubOrganizationsPlugin::Relation.children(profile)
+    @tokenized_children = prepare_to_token_input(@children)
+    @pending_children = SubOrganizationsPlugin::ApprovePaternityRelation.pending_children(profile)
+    if request.post?
+      begin
+        original = SubOrganizationsPlugin::Relation.children(profile)
+        requested = Organization.find(params[:q].split(','))
+        added = requested - original
+        removed = original - requested
+        added.each do |organization|
+          if current_person.has_permission?('perform_task',organization)
+            SubOrganizationsPlugin::Relation.add_children(profile, organization)
+          else
+            SubOrganizationsPlugin::ApprovePaternity.create!(:requestor => user, :temp_parent_type => profile.class.name, :temp_parent_id => profile.id, :target => organization)
+          end
+        end
+        SubOrganizationsPlugin::Relation.remove_children(profile,removed)
+        session[:notice] = _('Sub-organizations updated')
+      rescue Exception => exception
+        logger.error(exception.to_s)
+        session[:notice] = _('Sub-organizations could not be updated')
+      end
+      redirect_to :action => :index
+    end
+  end
+
+  def search_organization
+    render :text => prepare_to_token_input(environment.organizations.find(:all, :conditions =>
+      ["(LOWER(name) LIKE ? OR LOWER(identifier) LIKE ?)
+        AND (identifier NOT LIKE ?) AND (id != ?)",
+        "%#{params[:q]}%", "%#{params[:q]}%", "%_template", profile.id]).
+      select { |organization|
+        SubOrganizationsPlugin::Relation.children(organization).blank? &&
+        !SubOrganizationsPlugin::ApprovePaternityRelation.pending_children(profile).include?(organization)
+      }).to_json
+  end
+
+  private
+
+  def organizations_only
+    render_not_found if !profile.organization?
+  end
+
+  def prepare_to_token_input(array)
+    array.map { |object| {:id => object.id, :name => object.name} }
+  end
+end
@@ -0,0 +1,12 @@
+class CreateRelation < ActiveRecord::Migration
+  def self.up
+    create_table :sub_organizations_plugin_relations do |t|
+      t.references :parent, :polymorphic => true
+      t.references :child, :polymorphic => true
+    end
+  end
+
+  def self.down
+    drop_table :sub_organizations_plugin_relations
+  end
+end
@@ -0,0 +1,13 @@
+class ApprovePaternityRelation < ActiveRecord::Migration
+  def self.up
+    create_table :sub_organizations_plugin_approve_paternity_relations do |t|
+      t.references :task
+      t.references :parent, :polymorphic => true
+      t.references :child, :polymorphic => true
+    end
+  end
+
+  def self.down
+    drop_table :sub_organizations_plugin_approve_paternity_relations
+  end
+end
@@ -0,0 +1,46 @@
+require_dependency 'sub_organizations_plugin/ext/organization'
+require_dependency 'sub_organizations_plugin/ext/create_enterprise'
+
+class SubOrganizationsPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    _("Sub-groups")
+  end
+
+  def self.plugin_description
+    _("Adds the ability for groups to have sub-groups.")
+  end
+
+  def control_panel_buttons
+    if context.profile.organization? && SubOrganizationsPlugin::Relation.parents(context.profile).blank?
+      { :title => _('Manage sub-groups'), :icon => 'groups', :url => {:controller => 'sub_organizations_plugin_myprofile'} }
+    end
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def organization_members(organization)
+    children = SubOrganizationsPlugin::Relation.children(organization)
+    Person.members_of(children) if children.present?
+  end
+
+  def has_permission?(person, permission, target)
+    if !target.kind_of?(Environment) && target.organization?
+      SubOrganizationsPlugin::Relation.parents(target).map do |parent|
+        person.has_permission_without_plugins?(permission, parent)
+      end.include?(true)
+    end
+  end
+
+  def new_community_hidden_fields
+    parent_to_be = context.params[:sub_organizations_plugin_parent_to_be]
+    {'sub_organizations_plugin_parent_to_be' => parent_to_be} if parent_to_be.present?
+  end
+
+  def enterprise_registration_hidden_fields
+    parent_to_be = context.params[:sub_organizations_plugin_parent_to_be]
+    {'sub_organizations_plugin_parent_to_be' => parent_to_be} if parent_to_be.present?
+  end
+end
@@ -0,0 +1,57 @@
+class SubOrganizationsPlugin::ApprovePaternity < Task
+  validates_presence_of :requestor, :target
+
+  settings_items :temp_parent_id
+  settings_items :temp_parent_type
+
+  after_create do |task|
+    r = SubOrganizationsPlugin::ApprovePaternityRelation.create!(:task => task, :parent => task.temp_parent, :child => task.target)
+  end
+
+  def temp_parent
+    temp_parent_type.constantize.find(temp_parent_id)
+  end
+
+  def parent
+    SubOrganizationsPlugin::ApprovePaternityRelation.parent(self)
+  end
+
+  def title
+    _("Paternity request")
+  end
+
+  def linked_subject
+    {:text => parent.name, :url => parent.url}
+  end
+
+  def information
+    {:message => _('%{requestor} wants to add this organization as a sub-organization of %{linked_subject}.')}
+  end
+
+  def reject_details
+    true
+  end
+
+  def icon
+    {:type => :profile_image, :profile => parent, :url => parent.url}
+  end
+
+  def task_created_message
+    ('%{requestor} wants to add your organization %{target} as a sub-organization of %{parent}.') % {:requestor => requestor.name, :target => target.name, :parent => temp_parent.name}
+  end
+
+  def task_finished_message
+    ('%{target} accepted your request to add it as a sub-organization of %{parent}.') % {:target => target.name, :parent => parent.name}
+  end
+
+  def task_cancelled_message
+    ('%{target} refused your request to add it as a sub-organization of %{parent}.') % {:target => target.name, :parent => parent.name}
+  end
+
+  protected
+
+  def perform
+    SubOrganizationsPlugin::Relation.add_children(parent, target)
+  end
+
+end
@@ -0,0 +1,23 @@
+class SubOrganizationsPlugin::ApprovePaternityRelation < Noosfero::Plugin::ActiveRecord
+  belongs_to :task
+  belongs_to :parent, :polymorphic => true
+  belongs_to :child, :polymorphic => true
+
+  validates_presence_of :task, :parent, :child
+
+  class << self
+    def parent(task)
+      find_by_task_id(task.id).parent
+    end
+
+    def pending_children(parent)
+      options = {
+        :select => "distinct profiles.*",
+        :joins => "inner join sub_organizations_plugin_approve_paternity_relations as relations on profiles.id=relations.child_id inner join tasks on relations.task_id=tasks.id",
+        :conditions => ["relations.parent_id = ? AND tasks.status = 1", parent.id]
+      }
+      ActiveRecord::NamedScope::Scope.new(Organization, options)
+    end
+  end
+
+end
@@ -0,0 +1,5 @@
+require_dependency 'create_enterprise'
+
+class CreateEnterprise
+  settings_items :sub_organizations_plugin_parent_to_be
+end
@@ -0,0 +1,13 @@
+require_dependency 'organization'
+class Organization
+  settings_items :sub_organizations_plugin_parent_to_be
+
+  after_create do |organization|
+    if organization.sub_organizations_plugin_parent_to_be.present?
+      parent = Organization.find(organization.sub_organizations_plugin_parent_to_be)
+      SubOrganizationsPlugin::Relation.add_children(parent,organization)
+    end
+  end
+
+  FIELDS << 'sub_organizations_plugin_parent_to_be'
+end
@@ -0,0 +1,54 @@
+class SubOrganizationsPlugin::Relation < Noosfero::Plugin::ActiveRecord
+  belongs_to :parent, :polymorphic => true
+  belongs_to :child, :polymorphic => true
+
+  validates_presence_of :parent, :child
+  validate :no_self_reference
+  validate :no_cyclical_reference, :if => 'parent.present? && child.present?'
+  validate :no_multi_level, :if => 'parent.present? && child.present?'
+
+  def no_self_reference
+    errors.add(:child, _('self-reference is not allowed.')) if parent == child
+  end
+
+  def no_cyclical_reference
+    if self.class.children(child).include?(parent)
+      errors.add(:child, _('cyclical reference is not allowed.'))
+    end
+  end
+
+  def no_multi_level
+    if self.class.parents(parent).present? || self.class.children(child).present?
+      errors.add(:child, _('multi-level paternity is not allowed.'))
+    end
+  end
+
+  class << self
+    def children(parent)
+      options = {
+        :select => "profiles.*",
+        :joins => "inner join sub_organizations_plugin_relations as relations on profiles.id=relations.child_id",
+        :conditions => ["relations.parent_id = ?", parent.id]
+      }
+      ActiveRecord::NamedScope::Scope.new(Organization, options)
+    end
+
+    def parents(child)
+      options = {
+        :select => "profiles.*",
+        :joins => "inner join sub_organizations_plugin_relations as relations on profiles.id=relations.parent_id",
+        :conditions => ["relations.child_id = ?", child.id]
+      }
+      ActiveRecord::NamedScope::Scope.new(Organization, options)
+    end
+
+    def add_children(parent, *children)
+      children.each {|child| create!(:parent => parent, :child => child)}
+    end
+
+    def remove_children(parent, *children)
+      children.flatten.each {|child| find_by_parent_id_and_child_id(parent.id, child.id).destroy}
+    end
+  end
+
+end
@@ -0,0 +1,3 @@
+#content .token-input-list {
+  margin-bottom: 30px;
+}
@@ -0,0 +1,89 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/sub_organizations_plugin_myprofile_controller'
+
+# Re-raise errors caught by the controller.
+class SubOrganizationsPluginMyprofileController; def rescue_action(e) raise e end; end
+
+class SubOrganizationsPluginMyprofileControllerTest < ActionController::TestCase
+  def setup
+    @controller = SubOrganizationsPluginMyprofileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @organization = Organization.create!(:name => 'My Organization', :identifier => 'my-organization')
+    @person = create_user('person').person
+    @organization.add_admin(@person)
+    login_as(@person.user.login)
+    e = Environment.default
+    e.enable_plugin('SubOrganizationsPlugin')
+    e.save!
+  end
+
+  attr_accessor :person, :organization
+
+  should 'search organizations' do
+    # Should list if match name
+    o1 = fast_create(Organization, :name => 'sample organization 1')
+    # Should be case insensitive
+    o2 = fast_create(Organization, :name => 'SaMpLe OrGaNiZaTiOn 2')
+    # Should not list if don't match name
+    o3 = fast_create(Organization, :name => 'blo')
+    # Should not list if is has children
+    child = fast_create(Organization)
+    o4 = fast_create(Organization, :name => 'sample organization 4')
+    SubOrganizationsPlugin::Relation.add_children(o4, child)
+    # Should not list if is there is a task to add it
+    o5 = fast_create(Organization, :name => 'sample enterprise 5')
+    SubOrganizationsPlugin::ApprovePaternity.create!(:requestor => person, :target => o5, :temp_parent_id => organization.id, :temp_parent_type => organization.class.name)
+    # Should search by identifier
+    o6 = fast_create(Organization, :name => 'Bla', :identifier => 'sample-enterprise-6')
+    # Should not list itself
+    organization.name = 'Sample Organization'
+    organization.save!
+
+    get :search_organization, :profile => organization.identifier, :q => 'sampl'
+
+    assert_match /#{o1.name}/, @response.body
+    assert_match /#{o2.name}/, @response.body
+    assert_no_match /#{o3.name}/, @response.body
+    assert_no_match /#{o4.name}/, @response.body
+    assert_no_match /#{o5.name}/, @response.body
+    assert_match /#{o6.name}/, @response.body
+    assert_no_match /#{organization.name}/, @response.body
+  end
+
+  should 'update sub-organizations list' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    org3 = fast_create(Organization)
+    org4 = fast_create(Organization)
+    SubOrganizationsPlugin::Relation.add_children(organization, org1, org2)
+
+    post :index, :profile => organization.identifier, :q => [org2,org3,org4].map(&:id).join(',')
+
+    children = SubOrganizationsPlugin::Relation.children(organization)
+    assert_not_includes children, org1
+    assert_includes children, org2
+    assert_not_includes children, org3
+    assert_not_includes children, org4
+
+    SubOrganizationsPlugin::ApprovePaternity.all.map(&:finish)
+
+    children = SubOrganizationsPlugin::Relation.children(organization)
+    assert_not_includes children, org1
+    assert_includes children, org2
+    assert_includes children, org3
+    assert_includes children, org4
+  end
+
+  should 'establish relation right away if the user can perform tasks on the sub-organization' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    org2.add_admin(person)
+
+    assert_difference SubOrganizationsPlugin::ApprovePaternity, :count, 1 do
+      post :index, :profile => organization.identifier, :q => [org1,org2].map(&:id).join(',')
+    end
+    assert_includes SubOrganizationsPlugin::Relation.children(organization), org2
+  end
+
+end
@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class SubOrganizationsPlugin::ApprovePaternityRelationTest < ActiveSupport::TestCase
+
+  def setup
+    @requestor = create_user('some-user').person
+  end
+
+  attr_reader :requestor
+
+  should 'return parent' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    task = SubOrganizationsPlugin::ApprovePaternity.create!(:requestor => requestor, :target => org2, :temp_parent_id => org1.id, :temp_parent_type => org1.class.name)
+
+    assert_equal SubOrganizationsPlugin::ApprovePaternityRelation.parent(task), org1
+  end
+
+  should 'list pending children' do
+    organization = fast_create(Organization)
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    org3 = fast_create(Organization)
+
+    SubOrganizationsPlugin::ApprovePaternity.create!(:requestor => requestor, :target => org1, :temp_parent_id => organization.id, :temp_parent_type => organization.class.name)
+    SubOrganizationsPlugin::ApprovePaternity.create!(:requestor => requestor, :target => org2, :temp_parent_id => organization.id, :temp_parent_type => organization.class.name)
+
+    assert_includes SubOrganizationsPlugin::ApprovePaternityRelation.pending_children(organization), org1
+    assert_includes SubOrganizationsPlugin::ApprovePaternityRelation.pending_children(organization), org2
+    assert_not_includes SubOrganizationsPlugin::ApprovePaternityRelation.pending_children(organization), org3
+  end
+end
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class SubOrganizationsPlugin::ApprovePaternityTest < ActiveSupport::TestCase
+
+  def setup
+    @requestor = create_user('some-user').person
+  end
+
+  attr_reader :requestor
+
+  should 'create relation after creation' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    assert_difference SubOrganizationsPlugin::ApprovePaternityRelation, :count, 1 do
+      SubOrganizationsPlugin::ApprovePaternity.create!(:requestor => requestor, :temp_parent_id => org1.id, :temp_parent_type => org1.class.name, :target => org2)
+    end
+  end
+
+  should 'add children to parent after approving' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+
+    task = SubOrganizationsPlugin::ApprovePaternity.create!(:requestor => requestor, :temp_parent_id => org1.id, :temp_parent_type => org1.class.name, :target => org2)
+    assert_not_includes SubOrganizationsPlugin::Relation.children(org1), org2
+
+    task.finish
+    assert_includes SubOrganizationsPlugin::Relation.children(org1), org2
+  end
+end
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../../../../../../test/test_helper'
+
+class CreateEnterpriseTest < ActiveSupport::TestCase
+
+  should 'inlude the parent field in create enterprise' do
+    create_enterprise = CreateEnterprise.new
+    assert_nothing_raised { create_enterprise.sub_organizations_plugin_parent_to_be = '999' }
+  end
+
+end
+
@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../../../../../test/test_helper'
+
+class OrganizationTest < ActiveSupport::TestCase
+
+  should 'inlude the parent field in organization' do
+    organization = Organization.new
+    assert_nothing_raised { organization.sub_organizations_plugin_parent_to_be = '999' }
+  end
+
+  should 'include the parent field in the FIELDS constant' do
+    assert_includes Organization::FIELDS, 'sub_organizations_plugin_parent_to_be'
+  end
+
+  should 'relate organization with parent if the attribute is set' do
+    parent = fast_create(Organization)
+    organization = Organization.new(:identifier => 'some-org',:name => 'Some Org', :sub_organizations_plugin_parent_to_be => parent.id)
+    assert_not_includes SubOrganizationsPlugin::Relation.children(parent), organization
+
+    organization.save!
+    assert_includes SubOrganizationsPlugin::Relation.children(parent), organization
+  end
+
+end
@@ -0,0 +1,110 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
+
+  should 'validates presence of child and parent' do
+    org = fast_create(Organization)
+    relation = SubOrganizationsPlugin::Relation.new
+
+    relation.parent = org
+    relation.valid?
+    assert relation.errors.invalid?(:child)
+
+    relation.parent = nil
+    relation.child = org
+    relation.valid?
+    assert relation.errors.invalid?(:parent)
+  end
+
+  should 'relate two organizations' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    relation = SubOrganizationsPlugin::Relation.create!(:parent => org1, :child => org2)
+
+    assert_equal org1, relation.parent
+    assert_equal org2, relation.child
+  end
+
+  should 'not allow self relation' do
+    org = fast_create(Organization)
+    relation = SubOrganizationsPlugin::Relation.new(:parent_id => org, :child_id => org)
+    assert !relation.valid?
+    assert relation.errors.invalid?(:child)
+  end
+
+  should 'be able to retrieve parents of an organization' do
+    child = fast_create(Organization)
+    parent1 = fast_create(Organization)
+    parent2 = fast_create(Organization)
+    SubOrganizationsPlugin::Relation.create!(:parent => parent1, :child => child)
+    SubOrganizationsPlugin::Relation.create!(:parent => parent2, :child => child)
+
+    assert_includes SubOrganizationsPlugin::Relation.parents(child), parent1
+    assert_includes SubOrganizationsPlugin::Relation.parents(child), parent2
+  end
+
+  should 'be able to retrieve children of an organization' do
+    parent = fast_create(Organization)
+    child1 = fast_create(Organization)
+    child2 = fast_create(Organization)
+    SubOrganizationsPlugin::Relation.create!(:parent => parent, :child => child1)
+    SubOrganizationsPlugin::Relation.create!(:parent => parent, :child => child2)
+
+    assert_includes SubOrganizationsPlugin::Relation.children(parent), child1
+    assert_includes SubOrganizationsPlugin::Relation.children(parent), child2
+  end
+
+  should 'not allow cyclical reference' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    SubOrganizationsPlugin::Relation.create!(:parent => org1, :child => org2)
+    relation = SubOrganizationsPlugin::Relation.new(:parent => org2, :child => org1)
+
+    assert !relation.valid?
+    assert relation.errors.invalid?(:child)
+  end
+
+  should 'not allow multi-level paternity' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    org3 = fast_create(Organization)
+    SubOrganizationsPlugin::Relation.create!(:parent => org1, :child => org2)
+    r1 = SubOrganizationsPlugin::Relation.new(:parent => org2, :child => org3)
+    r2 = SubOrganizationsPlugin::Relation.new(:parent => org3, :child => org1)
+
+    assert !r1.valid?
+    assert r1.errors.invalid?(:child)
+
+    assert !r2.valid?
+    assert r2.errors.invalid?(:child)
+  end
+
+  should 'add children' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    org3 = fast_create(Organization)
+    org4 = fast_create(Organization)
+
+    SubOrganizationsPlugin::Relation.add_children(org1,org2)
+    assert_includes SubOrganizationsPlugin::Relation.children(org1), org2
+
+    SubOrganizationsPlugin::Relation.add_children(org1,org3,org4)
+    assert_includes SubOrganizationsPlugin::Relation.children(org1), org3
+    assert_includes SubOrganizationsPlugin::Relation.children(org1), org4
+  end
+
+  should 'remove children' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    org3 = fast_create(Organization)
+    org4 = fast_create(Organization)
+    SubOrganizationsPlugin::Relation.add_children(org1,org2,org3,org4)
+
+    SubOrganizationsPlugin::Relation.remove_children(org1,org2)
+    assert_not_includes SubOrganizationsPlugin::Relation.children(org1), org2
+
+    SubOrganizationsPlugin::Relation.remove_children(org1,org3,org4)
+    assert_not_includes SubOrganizationsPlugin::Relation.children(org1), org3
+    assert_not_includes SubOrganizationsPlugin::Relation.children(org1), org4
+  end
+end
@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class SubOrganizationsTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = SubOrganizationsPlugin.new
+  end
+
+  attr_reader :plugin
+
+  should 'include sub-organizations members in the parent organization' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    org3 = fast_create(Organization)
+    member1 = fast_create(Person)
+    member2 = fast_create(Person)
+    member3 = fast_create(Person)
+    member4 = fast_create(Person)
+    member5 = fast_create(Person)
+    member6 = fast_create(Person)
+    member7 = fast_create(Person)
+    org1.add_member(member1)
+    org2.add_member(member2)
+    org2.add_member(member3)
+    org3.add_member(member4)
+    org3.add_member(member5)
+    SubOrganizationsPlugin::Relation.create!(:parent => org1, :child => org2)
+    SubOrganizationsPlugin::Relation.create!(:parent => org1, :child => org3)
+
+    org1_members = plugin.organization_members(org1)
+
+    assert_equal ActiveRecord::NamedScope::Scope, org1_members.class
+    assert_not_includes org1_members, member1
+    assert_includes org1_members, member2
+    assert_includes org1_members, member3
+    assert_includes org1_members, member4
+    assert_includes org1_members, member5
+    assert_not_includes org1_members, member6
+    assert_not_includes org1_members, member7
+
+    org2_members = plugin.organization_members(org2)
+    org3_members = plugin.organization_members(org3)
+
+    assert org2_members.blank?
+    assert org3_members.blank?
+  end
+
+  should 'grant permission that user has on parent organizations over children orgnaizations' do
+    person = create_user('admin-user').person
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    SubOrganizationsPlugin::Relation.add_children(org1,org2)
+    person.stubs('has_permission_without_plugins?').with(:make_ice_cream, org1).returns(true)
+    person.stubs('has_permission_without_plugins?').with(:make_ice_cream, org2).returns(false)
+
+    assert plugin.has_permission?(person, :make_ice_cream, org2)
+  end
+
+  should 'not crash if receives an environment as target of has permission' do
+    assert_nothing_raised do
+      plugin.has_permission?(fast_create(Person), :make_ice_cream, fast_create(Environment))
+    end
+  end
+
+  should 'display control panel button only to organizations with no parent' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    profile = fast_create(Profile)
+    SubOrganizationsPlugin::Relation.add_children(org1,org2)
+    context = mock()
+    SubOrganizationsPlugin.any_instance.stubs(:context).returns(context)
+
+    context.stubs(:profile).returns(org1)
+    assert_not_nil plugin.control_panel_buttons
+
+    context.stubs(:profile).returns(org2)
+    assert_nil plugin.control_panel_buttons
+
+    context.stubs(:profile).returns(profile)
+    assert_nil plugin.control_panel_buttons
+  end
+end
+
@@ -0,0 +1,31 @@
+<h1><%= _('Manage sub-groups') %></h1>
+
+<% if !@pending_children.blank? %>
+  <%= _('Sub-groups awaiting approval:') %>
+  <ul>
+    <% @pending_children.each do |child| %>
+      <li><%= link_to(child.name, child.url) %></li>
+    <% end %>
+  </ul>
+<% end %>
+
+<% form_tag do %>
+  <% button_bar do %>
+    <%= button(:add, __('Create a new sub-community'), :controller => 'memberships', :action => 'new_community', :profile => user.identifier, :sub_organizations_plugin_parent_to_be => profile.id) %>
+    <%= button :add, __('Register a new sub-enterprise'), :controller => 'enterprise_registration', :sub_organizations_plugin_parent_to_be => profile.id if environment.enabled?('enterprise_registration') %>
+  <% end %>
+
+  <%= token_input_field_tag(:q, 'search-organization', {:action => 'search_organization'},
+    { :focus => true,
+      :hint_text => _('Type in a search term for a group'),
+      :pre_populate => @tokenized_children}) %>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save'))%>
+    <%= button('cancel', _('Cancel'), {:controller => 'profile_editor'})%>
+  <% end %>
+<% end %>
+
+<br style='clear: both'/>
+
+<%= render :partial => 'shared/list_groups', :locals => {:profile => user, :groups => @children} %>
@@ -3602,46 +3602,50 @@ h1#agenda-title {
 /* ==> public/stylesheets/controller_memberships.css <== */
 /* @import url(profile-list-block.css); ==> BROKEN REFERENCE, OH MY! */
  
-.controller-memberships #memberships-index ul {
+#groups-list {
   width: 100%;
   padding: 0px;
   margin: 0px;
   display: block;
 }
-.controller-memberships #memberships-index li {
+
+#groups-list li {
   display: block;
   list-style: none;
   margin-bottom: 20px background-color: #B8CFE7;
 }
-.controller-memberships #memberships-index li .vcard {
+
+#groups-list li .vcard {
   float: right;
   padding: 5px;
   margin-bottom: 5px;
   margin-left: 10px;
 }
-.controller-memberships #memberships-index li .may-clear {
+#groups-list li .may-clear {
   clear: right;
 }
-.controller-memberships #memberships-index li .profile-details {
+
+#groups-list li .profile-details {
   display: block;
   padding: 3% 0px 0px 30px;
 }
-.controller-memberships .action_memberships_destroy_community .main-block u {
-  text-decoration: none;
-  border-bottom: 1px dotted red;
-}
-#memberships-index .menu-submenu {
+
+#groups-list .menu-submenu {
   bottom: 127px;
   right: -20px;
 }
-#memberships-index .menu-submenu li {
+
+#groups-list .menu-submenu li {
   border: 0;
   background: transparent;
 }
-.controller-memberships .button-bar {
+
+#groups-list .button-bar {
   clear: both;
 }
-.controller-memberships #memberships-index li .vcard a.profile_link.url, .controller-memberships #memberships-index li .vcard a.profile_link.url:hover {
+
+#groups-list li .vcard a.profile_link.url,
+#groups-list li .vcard a.profile_link.url:hover {
   background: transparent;
   border: 0;
   text-decoration: none;
@@ -180,4 +180,27 @@ class EnterpriseRegistrationControllerTest &lt; ActionController::TestCase
     get :index
     assert_equal assigns(:create_enterprise).target, environment
   end
+
+  should 'include hidden fields supplied by plugins on enterprise registration' do
+    class Plugin1 < Noosfero::Plugin
+      def enterprise_registration_hidden_fields
+        {'plugin1' => 'Plugin 1'}
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def enterprise_registration_hidden_fields
+        {'plugin2' => 'Plugin 2'}
+      end
+    end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1.name)
+    environment.enable_plugin(Plugin2.name)
+
+    get :index
+
+    assert_tag :tag => 'input', :attributes => {:id => 'create_enterprise_plugin1', :type => 'hidden', :value => 'Plugin 1'}
+    assert_tag :tag => 'input', :attributes => {:id => 'create_enterprise_plugin2', :type => 'hidden', :value => 'Plugin 2'}
+  end
 end
@@ -206,4 +206,27 @@ class MembershipsControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'textarea', :attributes => {:name => 'community[description]'}
   end
  
+  should 'include hidden fields supplied by plugins on new community' do
+    class Plugin1 < Noosfero::Plugin
+      def new_community_hidden_fields
+        {'plugin1' => 'Plugin 1'}
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def new_community_hidden_fields
+        {'plugin2' => 'Plugin 2'}
+      end
+    end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1.name)
+    environment.enable_plugin(Plugin2.name)
+
+    get :new_community, :profile => profile.identifier
+
+    assert_tag :tag => 'input', :attributes => {:id => 'community_plugin1', :type => 'hidden', :value => 'Plugin 1'}
+    assert_tag :tag => 'input', :attributes => {:id => 'community_plugin2', :type => 'hidden', :value => 'Plugin 2'}
+  end
+
 end
@@ -3,6 +3,10 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class PersonTest < ActiveSupport::TestCase
   fixtures :profiles, :users, :environments
  
+  def teardown
+    Thread.current[:enabled_plugins] = nil
+  end
+
   def test_person_must_come_form_the_cration_of_an_user
     p = Person.new(:environment => Environment.default, :name => 'John', :identifier => 'john')
     assert !p.valid?
@@ -1104,6 +1108,18 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_equal [person], Person.members_of(community)
   end
  
+  should 'be able to pass array to members_of' do
+    person1 = fast_create(Person)
+    community = fast_create(Community)
+    community.add_member(person1)
+    person2 = fast_create(Person)
+    enterprise = fast_create(Enterprise)
+    enterprise.add_member(person2)
+
+    assert_includes Person.members_of([community, enterprise]), person1
+    assert_includes Person.members_of([community, enterprise]), person2
+  end
+
   should 'find more active people' do
     Person.destroy_all
     p1 = fast_create(Person)
@@ -1228,4 +1244,26 @@ class PersonTest &lt; ActiveSupport::TestCase
  
     assert_equivalent [person_scrap,person_activity], person.activities.map { |a| a.klass.constantize.find(a.id) }
   end
+
+  should 'allow plugins to extend person\'s permission access' do
+    person = create_user('some-user').person
+    class Plugin1 < Noosfero::Plugin
+      def has_permission?(person, permission, target)
+        true
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def has_permission?(person, permission, target)
+        false
+      end
+    end
+
+    e = Environment.default
+    e.enable_plugin(Plugin1.name)
+    e.enable_plugin(Plugin2.name)
+    person.stubs('has_permission_without_plugins?').returns(false)
+
+    assert person.has_permission?('bli', Profile.new)
+  end
 end
@@ -10,10 +10,8 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     @controller.stubs(:response).returns()
     @controller.stubs(:environment).returns(@environment)
     @controller.stubs(:params).returns()
-    @manager = Noosfero::Plugin::Manager.new(@controller)
   end
   attr_reader :environment
-  attr_reader :manager
  
   should 'return the intersection between environment\'s enabled plugins and system available plugins' do
     class Plugin1 < Noosfero::Plugin; end;
@@ -22,6 +20,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     class Plugin4 < Noosfero::Plugin; end;
     environment.stubs(:enabled_plugins).returns([Plugin1.to_s, Plugin2.to_s, Plugin4.to_s])
     Noosfero::Plugin.stubs(:all).returns([Plugin1.to_s, Plugin3.to_s, Plugin4.to_s])
+    manager = Noosfero::Plugin::Manager.new(@controller)
     plugins = manager.enabled_plugins.map { |instance| instance.class.to_s }
     assert_equal [Plugin1.to_s, Plugin4.to_s], plugins
   end
@@ -50,6 +49,7 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
  
     p1 = Plugin1.new
     p2 = Plugin2.new
+    manager = Noosfero::Plugin::Manager.new(@controller)
  
     assert_equal [p1.random_event, p2.random_event], manager.dispatch(:random_event)
   end
@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class ProfileTest < ActiveSupport::TestCase
   fixtures :profiles, :environments, :users, :roles, :domains
  
-  def setup
-    super
+  def teardown
+    Thread.current[:enabled_plugins] = nil
   end
  
   def test_identifier_validation
@@ -1833,6 +1833,37 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_equal [], profile.activities
   end
  
+  should 'merge members of plugins to original members' do
+    original_community = fast_create(Community)
+    community1 = fast_create(Community, :identifier => 'community1')
+    community2 = fast_create(Community, :identifier => 'community2')
+    original_member = fast_create(Person)
+    plugin1_member = fast_create(Person)
+    plugin2_member = fast_create(Person)
+    original_community.add_member(original_member)
+    community1.add_member(plugin1_member)
+    community2.add_member(plugin2_member)
+
+    class Plugin1 < Noosfero::Plugin
+      def organization_members(profile)
+        Person.members_of(Community.find_by_identifier('community1'))
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def organization_members(profile)
+        Person.members_of(Community.find_by_identifier('community2'))
+      end
+    end
+
+    original_community.stubs(:enabled_plugins).returns([Plugin1.new, Plugin2.new])
+
+    assert_includes original_community.members, original_member
+    assert_includes original_community.members, plugin1_member
+    assert_includes original_community.members, plugin2_member
+    assert 3, original_community.members.count
+  end
+
   private
  
   def assert_invalid_identifier(id)
@@ -0,0 +1,71 @@
+# monkey patch to add fake_arel select, or_scope and where methods
+# this gem requires activesupport-2.3.14 and activerecord-2.3.14
+# 
+# https://github.com/gammons/fake_arel
+
+module Rails3Finder
+  def self.included(base)
+    base.class_eval do
+
+      # the default named scopes
+      named_scope :offset, lambda {|offset| {:offset => offset}}
+      named_scope :limit, lambda {|limit| {:limit => limit}}
+      named_scope :includes, lambda { |*includes| { :include => includes }}
+      named_scope :order, lambda {|*order| {:order => order.join(',') }}
+      named_scope :joins, lambda {|*join| {:joins => join } if join[0]}
+      named_scope :from, lambda {|*from| {:from => from }}
+      named_scope :having, lambda {|*having| {:having => having }}
+      named_scope :group, lambda {|*group| {:group => group.join(',') }}
+      named_scope :readonly, lambda {|readonly| {:readonly => readonly }}
+      named_scope :lock, lambda {|lock| {:lock => lock }}
+
+      def self.select(value = Proc.new)
+        if block_given?
+          all.select {|*block_args| value.call(*block_args) }
+        else
+          self.scoped(:select => Array.wrap(value).join(','))
+        end
+      end
+
+      __where_fn = lambda do |*where|
+        if where.is_a?(Array) and where.size == 1
+          {:conditions => where.first}
+        else
+          {:conditions => where}
+        end
+      end
+
+      named_scope :where, __where_fn
+
+      # Use carefully this method! It might get lost with different classes 
+      # scopes or different types of joins. 
+      def self.or_scope(*scopes)
+        where = []
+        joins = []
+        includes = []
+
+        # for some reason, flatten is actually executing the scope
+        scopes = scopes[0] if scopes.size == 1
+        scopes.each do |s|
+          s = s.proxy_options
+          begin
+            where << merge_conditions(s[:conditions])
+          rescue NoMethodError
+            # I am ActiveRecord::Base. Only my subclasses define merge_conditions:
+            where << subclasses.first.merge_conditions(s[:conditions])
+          end
+          #where << merge_conditions(s[:conditions])
+          joins << s[:joins] unless s[:joins].nil?
+          includes << s[:include] unless s[:include].nil?
+        end
+        scoped = self
+        scoped = scoped.select("DISTINCT #{self.table_name}.*")
+        scoped = scoped.includes(includes.uniq.flatten) unless includes.blank?
+        scoped = scoped.joins(joins.uniq.flatten) unless joins.blank?
+        scoped.where(where.join(" OR "))
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Rails3Finder
1	1	class ApplicationController < ActionController::Base
2	2
3	3	before_filter :setup_multitenancy
	4	+ before_filter :detect_stuff_by_domain
	5	+ before_filter :init_noosfero_plugins
4	6
5	7	include ApplicationHelper
6	8	layout :get_layout
...	...	@@ -51,8 +53,6 @@ class ApplicationController < ActionController::Base
51	53
52	54	include NeedsProfile
53	55
54		- before_filter :detect_stuff_by_domain
55		- before_filter :init_noosfero_plugins
56	56	attr_reader :environment
57	57
58	58	before_filter :load_terminology
...	...
...	...	@@ -1352,4 +1352,53 @@ module ApplicationHelper
1352	1352	:style => 'margin-top: 1em'
1353	1353	)
1354	1354	end
	1355	+
	1356	+ def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
	1357	+ options[:min_chars] \|\|= 3
	1358	+ options[:hint_text] \|\|= _("Type in a search term")
	1359	+ options[:no_results_text] \|\|= _("No results")
	1360	+ options[:searching_text] \|\|= _("Searching...")
	1361	+ options[:search_delay] \|\|= 1000
	1362	+ options[:prevent_duplicates] \|\|= true
	1363	+ options[:backspace_delete_item] \|\|= false
	1364	+ options[:focus] \|\|= false
	1365	+ options[:avoid_enter] \|\|= true
	1366	+ options[:on_result] \|\|= 'null'
	1367	+ options[:on_add] \|\|= 'null'
	1368	+ options[:on_delete] \|\|= 'null'
	1369	+ options[:on_ready] \|\|= 'null'
	1370	+
	1371	+ result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
	1372	+ result +=
	1373	+ "
	1374	+ <script type='text/javascript'>
	1375	+ jQuery('##{element_id}')
	1376	+ .tokenInput('#{url_for(search_action)}', {
	1377	+ minChars: #{options[:min_chars].to_json},
	1378	+ prePopulate: #{options[:pre_populate].to_json},
	1379	+ hintText: #{options[:hint_text].to_json},
	1380	+ noResultsText: #{options[:no_results_text].to_json},
	1381	+ searchingText: #{options[:searching_text].to_json},
	1382	+ searchDelay: #{options[:serach_delay].to_json},
	1383	+ preventDuplicates: #{options[:prevent_duplicates].to_json},
	1384	+ backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
	1385	+ queryParam: #{name.to_json},
	1386	+ tokenLimit: #{options[:token_limit].to_json},
	1387	+ onResult: #{options[:on_result]},
	1388	+ onAdd: #{options[:on_add]},
	1389	+ onDelete: #{options[:on_delete]},
	1390	+ onReady: #{options[:on_ready]},
	1391	+ })
	1392	+ "
	1393	+ result += options[:focus] ? ".focus();" : ";"
	1394	+ if options[:avoid_enter]
	1395	+ result += "jQuery('#token-input-#{element_id}')
	1396	+ .live('keydown', function(event){
	1397	+ if(event.keyCode == '13') return false;
	1398	+ });"
	1399	+ end
	1400	+ result += "</script>"
	1401	+ result
	1402	+ end
	1403	+
1355	1404	end
...	...
...	...	@@ -22,7 +22,22 @@ class Person < Profile
22	22	super
23	23	end
24	24
25		- named_scope :members_of, lambda { \|resource\| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.resource_type = ? AND role_assignments.resource_id = ?', resource.class.base_class.name, resource.id ] } }
	25	+ acts_as_having_hotspots
	26	+
	27	+ named_scope :members_of, lambda { \|resources\|
	28	+ resources = [resources] if !resources.kind_of?(Array)
	29	+ conditions = resources.map {\|resource\| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id \|\| -1}"}.join(' OR ')
	30	+ { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
	31	+ }
	32	+
	33	+ def has_permission_with_plugins?(permission, profile)
	34	+ permissions = [has_permission_without_plugins?(permission, profile)]
	35	+ permissions += enabled_plugins.map do \|plugin\|
	36	+ plugin.has_permission?(self, permission, profile)
	37	+ end
	38	+ permissions.include?(true)
	39	+ end
	40	+ alias_method_chain :has_permission?, :plugins
26	41
27	42	def memberships
28	43	Profile.memberships_of(self)
...	...
...	...	@@ -60,6 +60,7 @@ class Profile < ActiveRecord::Base
60	60	}
61	61
62	62	acts_as_accessible
	63	+ acts_as_having_hotspots
63	64
64	65	named_scope :memberships_of, lambda { \|person\| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id ] } }
65	66	#FIXME: these will work only if the subclass is already loaded
...	...	@@ -68,13 +69,24 @@ class Profile < ActiveRecord::Base
68	69	named_scope :templates, :conditions => {:is_template => true}
69	70
70	71	def members
71		- Person.members_of(self)
	72	+ scopes = dispatch_scopes(:organization_members, self)
	73	+ scopes << Person.members_of(self)
	74	+ scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
72	75	end
73	76
74	77	def members_count
75		- members.count('DISTINCT(profiles.id)')
	78	+ members.count
76	79	end
77	80
	81	+ class << self
	82	+ def count_with_distinct(*args)
	83	+ options = args.last \|\| {}
	84	+ count_without_distinct(:id, {:distinct => true}.merge(options))
	85	+ end
	86	+ alias_method_chain :count, :distinct
	87	+ end
	88	+
	89	+
78	90	def members_by_role(role)
79	91	Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', role.id])
80	92	end
...	...
...	...	@@ -25,7 +25,7 @@ class ProfileListBlock < Block
25	25	end
26	26
27	27	def profile_count
28		- profiles.visible.count('DISTINCT(profiles.id)')
	28	+ profiles.visible.count
29	29	end
30	30
31	31	# the title of the block. Probably will be overriden in subclasses.
...	...
...	...	@@ -28,6 +28,12 @@
28	28	<%= hidden_field_tag 'create_enterprise[target_id]', environment.id %>
29	29	<% end %>
30	30
	31	+ <% @plugins.dispatch(:enterprise_registration_hidden_fields).each do \|field\| %>
	32	+ <% field.each do \|key, value\| %>
	33	+ <%= f.hidden_field(key, :value => value) %>
	34	+ <% end %>
	35	+ <% end %>
	36	+
31	37	<%= template_options(Enterprise, 'create_enterprise')%>
32	38
33	39	<% button_bar do %>
...	...
...	...	@@ -8,30 +8,6 @@
8	8	<%= button :back, _('Go back'), :controller => 'profile_editor' %>
9	9	<% end %>
10	10
11		-<ul>
12		-<% for membership in @memberships %>
13		- <li>
14		- <div class='common-profile-list-block'>
15		- <%= profile_image_link(membership, :portrait, 'div') %>
16		- </div>
17		- <span class='profile-details'>
18		- <strong><%= membership.name %></strong><br/>
19		- <%= _('Role: %s') % rolename_for(profile, membership) %> <br/>
20		- <%= _('Type: %s') % getterm(membership.class.identification) %> <br/>
21		- <%= _('Description: %s') % membership.description + '<br/>' if membership.community? %>
22		- <%= _('Members: %s') % membership.members_count.to_s %> <br/>
23		- <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
24		- <% button_bar do %>
25		- <%= button 'menu-ctrl-panel', _('Control panel of this group'), membership.admin_url %>
26		- <%= button 'menu-logout', _('Leave community'), membership.leave_url(true), :class => 'leave-community' %>
27		- <% if (membership.community? && user.has_permission?(:destroy_profile, membership)) %>
28		- <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => membership.identifier } %>
29		- <% end %>
30		- <% end %>
31		- </span>
32		- <br class="may-clear" />
33		- </li>
34		-<% end %>
35		-</ul>
	11	+<%= render :partial => 'shared/list_groups', :locals => {:groups => @memberships} %>
36	12
37	13	</div>
...	...
...	...	@@ -16,6 +16,12 @@
16	16
17	17	<%= required f.text_field(:name) %>
18	18
	19	+ <% @plugins.dispatch(:new_community_hidden_fields).each do \|field\| %>
	20	+ <% field.each do \|key, value\| %>
	21	+ <%= f.hidden_field(key, :value => value) %>
	22	+ <% end %>
	23	+ <% end %>
	24	+
19	25	<%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community } %>
20	26
21	27	<% f.fields_for :image_builder, @community.image do \|i\| %>
...	...
...	...	@@ -0,0 +1,26 @@
	1	+<ul id="groups-list">
	2	+<% for group in groups %>
	3	+ <li>
	4	+ <div class='common-profile-list-block'>
	5	+ <%= profile_image_link(group, :portrait, 'div') %>
	6	+ </div>
	7	+ <span class='profile-details'>
	8	+ <strong><%= group.name %></strong><br/>
	9	+ <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
	10	+ <%= _('Type: %s') % getterm(group.class.identification) %> <br/>
	11	+ <%= _('Description: %s') % group.description + '<br/>' if group.community? %>
	12	+ <%= _('Members: %s') % group.members_count.to_s %> <br/>
	13	+ <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
	14	+ <% button_bar do %>
	15	+ <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
	16	+ <%= button 'menu-logout', _('Leave community'), group.leave_url(true), :class => 'leave-community' %>
	17	+ <% if (group.community? && user.has_permission?(:destroy_profile, group)) %>
	18	+ <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => group.identifier } %>
	19	+ <% end %>
	20	+ <% end %>
	21	+ </span>
	22	+ <br class="may-clear" />
	23	+ </li>
	24	+<% end %>
	25	+</ul>
	26	+
...	...
1	1	require 'noosfero/plugin'
	2	+require 'noosfero/plugin/acts_as_having_hotspots'
2	3	require 'noosfero/plugin/manager'
3	4	require 'noosfero/plugin/context'
4	5	require 'noosfero/plugin/active_record'
...	...