Merge remote-tracking branch 'danielbucher/sub_organizations_improvements' into …

…sub_organizations_improvements

Merge remote-tracking branch 'danielbucher/sub_organizations_improvements' into …
…sub_organizations_improvements
Joenio Costa
2 parents b9d5a64e 11901a70
Showing 27 changed files with 822 additions and 35 deletions Show diff stats
app/models/person.rb
app/models/profile.rb
features/step_definitions/sub_organizations_block_steps.rb
features/support/paths.rb
lib/noosfero/plugin.rb
lib/scope_tool.rb
plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb
plugins/sub_organizations/features/sub_organizations_block.feature
plugins/sub_organizations/features/sub_organizations_display.feature
plugins/sub_organizations/lib/related_organizations_block.rb
plugins/sub_organizations/lib/sub_organizations_plugin.rb
plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb
plugins/sub_organizations/lib/sub_organizations_plugin/relation_helper.rb
plugins/sub_organizations/lib/sub_organizations_plugin/search_helper.rb
plugins/sub_organizations/public/images/arrow-right-p.png
plugins/sub_organizations/public/style.css
plugins/sub_organizations/test/functional/sub_organizations_plugin_profile_controller_test.rb
plugins/sub_organizations/test/unit/related_organizations_block_test.rb
plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb
plugins/sub_organizations/views/box_organizer/_related_organizations_block.rhtml
@@ -43,7 +43,12 @@ class Person &lt; Profile
   alias_method_chain :has_permission?, :plugins
  
   def memberships
-    Profile.memberships_of(self)
+    scopes = []
+    plugins_scopes = plugins.dispatch_scopes(:person_memberships, self)
+    scopes = plugins_scopes unless plugins_scopes.first.blank?
+    scopes << Profile.memberships_of(self)
+    return scopes.first if scopes.size == 1
+    ScopeTool.union *scopes
   end
  
    def memberships_by_role(role)
@@ -84,7 +84,8 @@ class Profile &lt; ActiveRecord::Base
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
     scopes << Person.members_of(self)
-    scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
+    return scopes.first if scopes.size == 1
+    ScopeTool.union *scopes
   end
  
   def members_count
@@ -0,0 +1,6 @@
+Given /^"([^\"]*)" is a sub organization of "([^\"]*)"$/ do |child, parent|
+  child = Organization.find_by_name(child) || Organization[child]
+  parent = Organization.find_by_name(parent) || Organization[parent]
+
+  SubOrganizationsPlugin::Relation.add_children(parent, child)
+end
@@ -114,6 +114,13 @@ module NavigationHelpers
     when /^(.+)'s members page/
       '/profile/%s/members' % profile_identifier($1)
  
+    when /^(.+)'s "(.+)" page from "(.*)" of "(.*)" plugin/
+      profile = $1
+      action = $2
+      plugin_name = $4.underscore
+      controller_type = $3.constantize.superclass.to_s.underscore.gsub(/_controller/, "")
+      "/#{controller_type}/#{profile}/plugin/#{plugin_name}/#{action}"
+
     else
       begin
         page_name =~ /the (.*) page/
@@ -372,6 +372,13 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Extends person memberships list
+  # returns = An instance of ActiveRecord::NamedScope::Scope retrived through
+  # Person.memberships_of method.
+  def person_memberships(person)
+    nil
+  end
+
   # -> Extends person permission access
   # returns = boolean
   def has_permission?(person, permission, target)
@@ -0,0 +1,15 @@
+module ScopeTool
+
+  # Sum scope results by SQL, allowing post filtering of the group.
+  def union(*scopes)
+    model = scopes.first.class_name.constantize
+    scopes = scopes.map &:to_sql
+    model.from "(\n#{scopes.join("\nUNION\n")}\n) as #{model.table_name}"
+  end
+
+  class << self
+    # Allows to use `ScopeTool.method()` anywhere.
+    include ScopeTool
+  end
+
+end
@@ -0,0 +1,45 @@
+class SubOrganizationsPluginProfileController < ProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  before_filter :organizations_only
+
+  def children
+    children = SubOrganizationsPlugin::Relation.children(profile)
+    family_relation(children)
+    render 'related_organizations'
+  end
+
+  def parents
+    parents = SubOrganizationsPlugin::Relation.parents(profile)
+    family_relation(parents)
+    render 'related_organizations'
+  end
+
+  private
+
+  def family_relation(_profile)
+    @communities = _profile.communities
+    @enterprises = _profile.enterprises
+    @full = true
+
+    if !params[:type] and !params[:display]
+      @communities = SubOrganizationsPlugin.limit(@communities)
+      @enterprises = SubOrganizationsPlugin.limit(@enterprises)
+      @full = false
+    elsif !params[:type]
+      @total = _profile
+      @total = @total.paginate(:per_page => 2, :page => params[:npage])
+      if params[:display] == 'compact'
+        @full = false
+      end
+    else
+      @communities = @communities.paginate(:per_page => 2, :page => params[:npage])
+      @enterprises = @enterprises.paginate(:per_page => 2, :page => params[:npage])
+    end
+  end
+
+  def organizations_only
+    render_not_found if !profile.organization?
+  end
+
+end
@@ -0,0 +1,62 @@
+Feature: related_organizations_block
+  As a user
+  I want my organizations to have blocks that lists it's related-organizations
+  In order to have quick access to it's related-organizations
+
+  Background:
+    Given "SubOrganizations" plugin is enabled
+    And the following users
+      | login | name |
+      | homer | Homer |
+    And the following community
+      | identifier | name | owner |
+      | springfield | Springfield | homer |
+      | moe | Moe's | homer |
+    And the following enterprise
+      | identifier | name | owner |
+      | duff | Duff | homer |
+    And "moe" is a sub organization of "springfield"
+    And "duff" is a sub organization of "springfield"
+    And I am logged in as "homer"
+    And I go to springfield's control panel
+
+  Scenario: display sub organizations block add option
+    When I follow "Edit sideboxes"
+    And I follow "Add a block"
+    Then I should see "Related Organizations"
+
+  Scenario: display both sub types on block
+    When I follow "Edit sideboxes"
+    And I follow "Add a block"
+    And I choose "Related Organizations"
+    And I press "Add"
+    Then I should see "Moe's" within ".related-organizations-block"
+    And I should see "Duff" within ".related-organizations-block"
+
+  Scenario: display only sub-communities
+    Given the following blocks
+      | owner | type |
+      | springfield | RelatedOrganizationsBlock |
+    When I follow "Edit sideboxes"
+    And I follow "Edit" within ".related-organizations-block"
+    And I select "Community" from "block_organization_type"
+    And I press "Save"
+    Then I should see "Moe's" within ".related-organizations-block"
+    And I should not see "Duff" within ".related-organizations-block"
+
+  Scenario: display both sub types on sub-organizations page
+    When I go to springfield's "children" page from "SubOrganizationsPluginProfileController" of "SubOrganizations" plugin
+    Then I should see "Moe's"
+    And I should see "Duff"
+
+  Scenario: display only sub-communities on sub-organizations page
+    Given the following blocks
+      | owner | type |
+      | springfield | RelatedOrganizationsBlock |
+    When I follow "Edit sideboxes"
+    And I follow "Edit" within ".related-organizations-block"
+    And I select "Community" from "block_organization_type"
+    And I press "Save"
+    And I follow "View all" within ".related-organizations-block"
+    Then I should see "Moe's" within ".profile-list"
+    And I should not see "Duff" within ".profile-list"
@@ -0,0 +1,80 @@
+Feature: sub_organizations_display
+  As a user
+  I want my organizations to have blocks that lists it's related-organizations
+  In order to have quick access to it's related-organizations
+
+   Background:
+   Given "SubOrganizations" plugin is enabled
+    And the following users
+      | login | name |
+      | nelson | Nelson |
+   And feature "enterprise_registration" is enabled on environment
+   And the following community
+      | identifier  | name        | owner  | description             | city        | state      |
+      | springfield | Springfield | nelson | Springfield description | Los Angeles | California |
+      | moe         | Moe         | nelson | Moe description         | Kansas      | Texas      |
+   And the following enterprise
+      | identifier | name   |  owner | description        | city           | state      |
+      | school     | School | nelson | School description | Terra do Nunca | Billy Jean |
+   And I am logged in as "nelson"
+   And I go to springfield's control panel
+   When I follow "Edit sideboxes"
+   And I follow "Add a block"
+   And I choose "Related Organizations"
+   And I press "Add"
+
+    @selenium
+    Scenario: Display the sub organization block when there is a sub enterprise and communitys
+      When I go to springfield's control panel
+      And I follow "Manage sub-groups"
+      And I follow "Register a new sub-enterprise"
+      And I fill in "Name" with "Bart"
+      And I press "Next"
+      Then I should see "Enterprise registration completed"
+      And I am logged in as admin
+      And I go to admin_user's control panel
+      When I follow "Tasks" within ".control-panel"
+      Then I should see "Nelson wants to create enterprise Bart."
+      And the first mail is to admin_user@example.com
+      And I choose "Accept"
+      And I press "Apply!"
+      And I am logged in as "nelson"
+      When I go to springfield's control panel
+      And I follow "Manage sub-groups"
+      And I follow "Create a new sub-community"
+      And I fill in "Name" with "Homer"
+      And I press "Create"
+      When I go to springfield's "children" page from "SubOrganizationsPluginProfileController" of "SubOrganizations" plugin
+      Then I should see "Homer" within ".related-organizations-block"
+      And I should see "Bart" within ".related-organizations-block"
+
+    Scenario: Display with compact mode
+      Given "moe" is a sub organization of "springfield"
+      And "school" is a sub organization of "springfield"
+      When I go to springfield's homepage
+      And I follow "View all" within ".related-organizations-block"
+      Then I should see "Springfield's sub-communities"
+      And I should see "Springfield's sub-enterprises"
+
+    Scenario: Display with full mode for sub-communities
+      Given "moe" is a sub organization of "springfield"
+      When I go to springfield's homepage
+      And I follow "View all" within ".related-organizations-block"
+      Then I should see "Springfield's sub-communities"
+      And I follow "Full" within ".search-customize-options"
+      Then I should see "Moe description" within ".related-organizations-description"
+      And I should see "Kansas, Texas" within ".related-organizations-region-name"
+
+    Scenario: Display with full mode for sub-enterprises
+      Given "school" is a sub organization of "springfield"
+      When I go to springfield's homepage
+      And I follow "View all" within ".related-organizations-block"
+      And I should see "Springfield's sub-enterprises"
+      And I follow "Full" within ".search-customize-options"
+      Then I should see "School description" within ".related-organizations-description"
+      And I should see "Terra do Nunca, Billy Jean" within ".related-organizations-region-name"
+
+    Scenario: Display message when display full block are empty
+      Given I follow "View all" within ".related-organizations-block"
+      Then I should see "There are no sub-communities yet."
+      And I should see "There are no sub-enterprises yet."
@@ -0,0 +1,60 @@
+class RelatedOrganizationsBlock < ProfileListBlock
+
+  settings_items :organization_type, :type => :string, :default => 'both'
+
+  @display_type = {:title => 'related', :action => 'children' }
+
+  def self.description
+    __("#{@display_type[:title].capitalize} Organizations")
+  end
+
+  def default_title
+    case organization_type
+    when 'enterprise'
+      n__("{#} #{@display_type[:title]} enterprise", "{#} #{@display_type[:title]} enterprises", profile_count)
+    when 'community'
+      n__("{#} #{@display_type[:title]} community", "{#} #{@display_type[:title]} communities", profile_count)
+    else
+      n__("{#} #{@display_type[:title]} organization", "{#} #{@display_type[:title]} organizations", profile_count)
+    end
+  end
+
+  def help
+    _("This block displays #{@display_type[:title]} organizations of this organization")
+  end
+
+  def profiles
+    organizations = related_organizations
+    case organization_type
+    when 'enterprise'
+      organizations.enterprises
+    when 'community'
+      organizations.communities
+    else
+      organizations
+    end
+  end
+
+  def footer
+    profile = self.owner
+    type = self.organization_type
+    params = {:profile => profile.identifier, :controller => 'sub_organizations_plugin_profile', :action => @display_type[:action]}
+    params[:type] = type if type == 'enterprise' || type == 'community'
+    lambda do
+      link_to _('View all'), params.merge(params)
+    end
+  end
+
+  def related_organizations
+    profile = self.owner
+    organizations = SubOrganizationsPlugin::Relation.parents(profile)
+
+    if organizations.blank?
+      @display_type = {:title => 'sub', :action => 'children'}
+      organizations = SubOrganizationsPlugin::Relation.children(profile)
+    else
+      @display_type = {:title => 'parent', :action => 'parents' }
+      organizations
+    end
+  end
+end
+require_dependency File.dirname(__FILE__) + '/related_organizations_block'
+
+class SubOrganizationsPlugin < Noosfero::Plugin; end;
+
+require_dependency 'sub_organizations_plugin/search_helper'
+
 class SubOrganizationsPlugin < Noosfero::Plugin
  
+  include SearchHelper
+
+  DISPLAY_LIMIT = 12
+
   def self.plugin_name
     _("Sub-groups")
   end
@@ -23,6 +33,10 @@ class SubOrganizationsPlugin &lt; Noosfero::Plugin
     Person.members_of(children) if children.present?
   end
  
+  def person_memberships(person)
+    SubOrganizationsPlugin::Relation.parents(*Profile.memberships_of(person))
+  end
+
   def has_permission?(person, permission, target)
     if !target.kind_of?(Environment) && target.organization?
       SubOrganizationsPlugin::Relation.parents(target).map do |parent|
@@ -40,4 +54,14 @@ class SubOrganizationsPlugin &lt; Noosfero::Plugin
     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 self.limit(organizations)
+    organizations.all(:limit => DISPLAY_LIMIT, :order => 'updated_at DESC').sort_by{ rand }
+  end
+
+  def self.extra_blocks
+    {
+      RelatedOrganizationsBlock => {:type => [Enterprise, Community], :position => ['1', '2', '3']}
+    }
+  end
 end
@@ -33,11 +33,11 @@ class SubOrganizationsPlugin::Relation &lt; Noosfero::Plugin::ActiveRecord
       ActiveRecord::NamedScope::Scope.new(Organization, options)
     end
  
-    def parents(child)
+    def parents(*children)
       options = {
         :select => "profiles.*",
         :joins => "inner join sub_organizations_plugin_relations as relations on profiles.id=relations.parent_id",
-        :conditions => ["relations.child_id = ?", child.id]
+        :conditions => ["relations.child_id in (?)", children.map(&:id)]
       }
       ActiveRecord::NamedScope::Scope.new(Organization, options)
     end
@@ -0,0 +1,9 @@
+module SubOrganizationsPlugin::RelationHelper
+  def display_relation(organization,type,display_mode)
+    if display_mode == 'full'
+      render :partial => 'sub_organizations_plugin_profile/full_related_organizations', :locals => {:organizations => organization,:organization_type => type}
+    else
+      render :partial => 'sub_organizations_plugin_profile/related_organizations', :locals => {:organizations => organization, :organization_type => type}
+    end
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,18 @@
+require_dependency 'search_helper'
+
+module SubOrganizationsPlugin::SearchHelper
+
+  include SearchHelper
+
+  def display_selectors(display, float = 'right')
+    display = 'compact' if display.blank?
+    compact_link = display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))
+    full_link = display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))
+    content_tag('div',
+      content_tag('strong', _('Display')) + ': ' + [compact_link,full_link].compact.join(' | ').html_safe,
+      :class => 'search-customize-options'
+    )
+  end
+
+
+end
@@ -0,0 +1 @@
+../../../../public/designs/themes/base/imgs/arrow-right-p.png
 \ No newline at end of file
 #content .token-input-list {
   margin-bottom: 30px;
 }
+
+.related-organizations-button-bar {
+  padding-top: 40px;
+  clear: both;
+}
+
+.related-organizations-block .block-footer-content a {
+  position: absolute;
+  top: 2px;
+  right: 0px;
+  font-size: 11px;
+  color: #000;
+  text-decoration: none;
+  padding-right: 15px;
+  background: url(images/arrow-right-p.png) 100% 50% no-repeat;
+}
+
+.clearfix {
+  clear: both;
+}
+
+.related-organizations-list-block .vcard{
+  margin-right: 10px;
+  -webkit-border-radius: 0 !important;
+  -moz-border-radius: 0!important;
+  -o-border-radius: 0!important;
+  border-radius: 0!important;
+}
+.related-organizations-item-column-right .search-result-title{
+  margin: 10px 0;
+}
+
+#main-content-wrapper-8 ul{
+  padding-left: 0;
+}
+
+.related-organizations-list-block ul li{
+  list-style: none;
+  margin: 10px 0;
+  border: 1px solid #ccc;
+  /*padding: 10px 5px;*/
+}
+
+.related-organizations-list-block ul li:hover{
+  border: 1px solid #999;
+}
+
+.related-organizations-list-block .profile_link{
+  height: auto !important;
+  max-height: none !important;
+  max-width: none !important;
+  height: 150px;
+  width: 150px;
+}
+
+.related-organizations-list-block .org {
+  display: none !important;
+}
+
+.related-organizations-item .profile-image img{
+  max-height: 150px;
+  max-width: 150px;
+}
+
+
+.menu-submenu-list>li{
+  border: 0!important;
+}
+
+.related-organizations-list-block .menu-submenu{
+  bottom: 147px;
+  right: 5px;
+}
+
+.related-organizations-region-name{
+  line-height: 2em;
+  font-weight: bold;
+}
+
+.related-organizations-description{
+  color: #333;
+}
+
+
+.related-organizations-list-block .vcard a{
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+.related-organizations-list-block .vcard img {
+  opacity: 1;
+  -webkit-transition: all 0.5s ease-out;
+     -moz-transition: all 0.5s ease-out;
+       -o-transition: all 0.5s ease-out;
+      -ms-transition: all 0.5s ease-out;
+          transition: all 0.5s ease-out;
+}
+
+.related-organizations-list-block .vcard img:hover {
+  opacity: 0.5;
+}
+
+.related-organizations-item-column-right {
+  float: right;
+  position: relative;
+  width: 65%;
+}
+
+.related-organizations-item-column-left {
+float: left;
+position: relative;
+width: 35%;
+}
+
+.related-organizations-block ul {
+  min-width: 196px;
+  width: 192px;
+  margin: 0px 0px 0px -3px;
+  padding: 0px;
+}
@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/sub_organizations_plugin_profile_controller'
+
+# Re-raise errors caught by the controller.
+class SubOrganizationsPluginProfileController; def rescue_action(e) raise e end; end
+
+class SubOrganizationsPluginProfileControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = SubOrganizationsPluginProfileController.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!
+    @o1 = fast_create(Organization, :name => 'sample child organization 1')
+    @o2 = fast_create(Community, :name => 'sample child community 1')
+    @o3 = fast_create(Enterprise, :name => 'sample child enterprise 1')
+
+    SubOrganizationsPlugin::Relation.add_children(@organization, @o2, @o3)
+  end
+
+  attr_accessor :person, :organization
+
+  should 'display all children organizations' do
+    get :children, :profile => @organization.identifier
+
+    assert_no_match /#{@o1.name}/, @response.body
+    assert_match /#{@o2.name}/, @response.body
+    assert_match /#{@o3.name}/, @response.body
+  end
+
+  should 'display only communities' do
+    get :children, :profile => @organization.identifier, :type => 'community'
+
+    assert_no_match /#{@o1.name}/, @response.body
+    assert_match /#{@o2.name}/, @response.body
+    assert_no_match /#{@o3.name}/, @response.body
+  end
+
+  should 'display only enterprises' do
+    get :children, :profile => @organization.identifier, :type => 'enterprise'
+
+    assert_no_match /#{@o1.name}/, @response.body
+    assert_no_match /#{@o2.name}/, @response.body
+    assert_match /#{@o3.name}/, @response.body
+  end
+
+  should 'not respond to person profiles' do
+    get :children, :profile => fast_create(Person, :name => 'Ze').identifier
+
+    assert_response :missing
+  end
+
+end
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../lib/related_organizations_block'
+
+class RelatedOrganizationsBlockTest < ActiveSupport::TestCase
+
+  def setup
+    @block = RelatedOrganizationsBlock.new
+  end
+
+  attr_reader :block
+
+  should 'have both as default organization_type' do
+    assert_equal "both", block.organization_type
+  end
+
+  should 'return only children when the organization is a parent' do
+    parent = fast_create(Organization, :name => 'I am your father', :identifier => 'i-am-your-father')
+    child1 = fast_create(Organization, :name => 'Rebel Alliance')
+    child2 = fast_create(Organization, :name => 'The Empire')
+    org1 = fast_create(Organization, :name => 'Jedi Council')
+    box = fast_create(Box, :owner_id => parent.id, :owner_type => 'Organization')
+    @block.box = box
+    @block.save!
+    SubOrganizationsPlugin::Relation.add_children(parent, child1, child2)
+
+    assert @block.related_organizations.include?(child1)
+    assert @block.related_organizations.include?(child2)
+    assert !@block.related_organizations.include?(org1)
+  end
+end
@@ -45,6 +45,35 @@ class SubOrganizationsTest &lt; ActiveSupport::TestCase
     assert org3_members.blank?
   end
  
+  should 'include parent-organizations in persons memberships' do
+    org1 = fast_create(Organization)
+    org2 = fast_create(Organization)
+    org3 = fast_create(Organization)
+    person1 = fast_create(Person)
+    person2 = fast_create(Person)
+    org1.add_member(person2)
+    org2.add_member(person1)
+    SubOrganizationsPlugin::Relation.create!(:parent => org1, :child => org2)
+    SubOrganizationsPlugin::Relation.create!(:parent => org1, :child => org3)
+
+    person1_memberships = plugin.person_memberships(person1)
+    person2_memberships = plugin.person_memberships(person2)
+
+    assert_equal ActiveRecord::NamedScope::Scope, person1_memberships.class
+    assert_includes person1_memberships, org1
+    assert_not_includes person1_memberships, org2
+    assert_not_includes person1_memberships, org3
+    assert person2_memberships.blank?
+  end
+
+  should 'return blank for person memberships with no organization ' do
+    person1 = fast_create(Person)
+
+    person1_memberships = plugin.person_memberships(person1)
+
+    assert person1_memberships.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)
@@ -0,0 +1,7 @@
+<div id='edit-related-organizations-block'>
+  <label for="block_organization_type"><%= _('Type of organizations to be displayed') %></label><br/>
+  <%= select_tag('block[organization_type]', options_for_select([[_('Both'), 'both'], [_('Community'), 'community'], [_('Enterprise'), 'enterprise']], @block.organization_type)) %>
+  <%= labelled_form_field _('Limit of items'), text_field(:block, :limit, :size => 3) %>
+  <%= check_box(:block, :prioritize_profiles_with_image) %>
+  <label for="block_prioritize_profiles_with_image"><%= _('Prioritize profiles with image') %></label>
+</div>
@@ -0,0 +1 @@
+box_organizer/
 \ No newline at end of file
@@ -0,0 +1,63 @@
+<% extend SubOrganizationsPlugin::SearchHelper %>
+<div class="related-organizations-list-block">
+
+  <h1><%= __("#{profile.name}'s sub-#{organization_type.pluralize}") %></h1>
+  <ul>
+  <% organizations.each do |organization| %>
+    <li class="related-organizations-item">
+      <div class="related-organizations-item">
+        <div class="related-organizations-item-column-left">
+          <%= profile_image_link organization, :big, 'div' %>
+        </div>
+        <div class="related-organizations-item-column-right">
+          <%= link_to_homepage(organization.name, organization.identifier, :class => "search-result-title") %>
+          <div class="related-organizations-description">
+            <% if organization.description %>
+              <% body_stripped = strip_tags(organization.description) %>
+            <% elsif organization.home_page and organization.home_page.body %>
+              <% body_stripped = strip_tags(organization.home_page.body) %>
+            <% end %>
+            <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
+          </div>
+          <div class="related-organizations-region">
+            <span class="related-organizations-region-label"><%= _("City") %></span>
+            <% if organization.region %>
+              <span class="related-organizations-region-name"><%= city_with_state(organization.region) %></span>
+            <% elsif organization.city and organization.state %>
+              <span class="related-organizations-region-name"><%= "#{organization.city}, #{organization.state}" %></span>
+            <% end %>
+          </div>
+
+          <div class="related-organizations-categorization">
+            <% organization.top_level_categorization.each do |parent, children| %>
+              <div class="related-organizations-category-<%=parent.id%> related-organizations-category">
+                <span class="related-organizations-categorization-parent"><%= parent.name %></span>
+                <span class="related-organizations-categorization-children">
+                  <%= children.collect(&:name).join(', ')  %>
+                </span>
+              </div>
+            <% end %>
+          </div>
+        </div>
+
+        <br class="clearfix" />
+
+      </div>
+    </li>
+  <% end %>
+  </ul>
+
+  <div id='pagination-related-organizations'>
+    <%= pagination_links(organizations, {:param_name => 'npage', :page_links => true})  %>
+  </div>
+
+  <% button_bar(:class => "related-organizations-button-bar") do %>
+    <%= button :back, _('Go back'), { :controller => 'profile' } %>
+    <%= button :add, __("Add a new #{organization_type}"), :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
+
+    <% if !@full %>
+      <%= button :more, _('View all'), { :controller => 'sub_organizations_plugin_profile', :action => params[:action], :type => organization_type } %>
+    <% end %>
+ <% end %>
+
+</div>
@@ -0,0 +1,27 @@
+<% extend SubOrganizationsPlugin::ApplicationHelper %>
+<div class="common-profile-list-block">
+  <h1><%= __("#{profile.name}'s sub-#{organization_type.pluralize}") %></h1>
+
+  <ul class='profile-list'>
+    <% organizations.each do |organization| %>
+      <%= profile_image_link(organization)%>
+    <% end %>
+  </ul>
+  <% if organizations.length == 0 %>
+    <li><%= __("There are no sub-#{organization_type.pluralize} yet. " )  %></li>
+  <% end %>
+  <% button_bar(:class => "related-organizations-button-bar") do %>
+    <%= button :back, _('Go back'), { :controller => 'profile' } %>
+    <%= button :add, __("Add a new #{organization_type}"), :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
+
+    <% if !@full %>
+      <%= button :more, _('View all'), { :controller => 'sub_organizations_plugin_profile', :action => params[:action], :type => organization_type } %>
+    <% end %>
+  <% end %>
+</div>
+<% if @full %>
+  <div id='pagination-profiles'>
+    <%= pagination_links(organizations, {:param_name => 'npage', :page_links => true})  %>
+  </div>
+<% end %>
+<!-- fim class="common-profile-list-block" -->
@@ -0,0 +1,21 @@
+<% extend SubOrganizationsPlugin::SearchHelper %>
+<% extend SubOrganizationsPlugin::RelationHelper %>
+
+<div id="search-actions">
+  <%= display_selectors(params[:display]) %>
+</div>
+
+<%  if params[:type] == 'community' %>
+  <%= display_relation(@communities,params[:type],params[:display]) %>
+<% end %>
+
+<% if params[:type] == 'enterprise' %>
+  <%= display_relation(@enterprises,params[:type],params[:display]) %>
+<% end %>
+
+<% if ["full"].include?(params[:display]) and !params[:type] %>
+   <%= display_relation(@total,"organizations",params[:display]) %>
+<% elsif !params[:type] %>
+  <%= display_relation(@communities,"community",params[:display]) %>
+  <%= display_relation(@enterprises,"enterprise",params[:display]) %>
+<% end %>
@@ -1413,4 +1413,37 @@ class PersonTest &lt; ActiveSupport::TestCase
     person.reload
     assert_equal person.activities, []
   end
+
+  should 'merge memberships of plugins to original memberships' do
+    class Plugin1 < Noosfero::Plugin
+      def person_memberships(person)
+        Profile.memberships_of(Person.find_by_identifier('person1'))
+      end
+    end
+
+    class Plugin2 < Noosfero::Plugin
+      def person_memberships(person)
+        Profile.memberships_of(Person.find_by_identifier('person2'))
+      end
+    end
+
+    Environment.default.enable_plugin(Plugin1)
+    Environment.default.enable_plugin(Plugin2)
+
+    original_person = fast_create(Person)
+    person1 = fast_create(Person, :identifier => 'person1')
+    person2 = fast_create(Person, :identifier => 'person2')
+    original_cmm = fast_create(Community)
+    plugin1_cmm = fast_create(Community)
+    plugin2_cmm = fast_create(Community)
+    original_cmm.add_member(original_person)
+    plugin1_cmm.add_member(person1)
+    plugin2_cmm.add_member(person2)
+
+    assert_includes original_person.memberships, original_cmm
+    assert_includes original_person.memberships, plugin1_cmm
+    assert_includes original_person.memberships, plugin2_cmm
+    assert 3, original_person.memberships.count
+  end
+
 end
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ScopeToolTest < ActiveSupport::TestCase
+  include ScopeTool
+
+  should 'unite scopes' do
+    cmm = fast_create Community
+    ent = fast_create Enterprise
+    orgs = union(Profile.communities, Profile.enterprises)
+    assert orgs.include? cmm
+    assert orgs.include? ent
+  end
+
+  should 'filter united scopes' do
+    cmm1 = fast_create Community, :visible => true
+    cmm2 = fast_create Community, :visible => false
+    ent1 = fast_create Enterprise, :visible => true
+    ent2 = fast_create Enterprise, :visible => false
+    orgs = union(Profile.communities, Profile.enterprises)
+    assert orgs.include? cmm1
+    assert orgs.include? cmm2
+    assert orgs.include? ent1
+    assert orgs.include? ent2
+    orgs = orgs.visible
+    assert orgs.include? cmm1
+    assert !orgs.include?(cmm2)
+    assert orgs.include? ent1
+    assert !orgs.include?(ent2)
+  end
+
+end
@@ -19,14 +19,6 @@ module Rails3Finder
       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}
@@ -37,33 +29,66 @@ module Rails3Finder
  
       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 = []
+      class << self
  
-        # 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])
+        def select(value = Proc.new)
+          if block_given?
+            all.select {|*block_args| value.call(*block_args) }
+          else
+            self.scoped(:select => Array.wrap(value).join(','))
           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 "))
+
+        def to_sql
+          join_dependency = JoinDependency.new(self, merge_includes(scope(:find, :include), nil), nil)
+          scope = scope(:find) || {}
+          options = current_scoped_methods || {}
+          sql = "SELECT #{(scope && scope[:select]) || default_select(options[:joins] || (scope && scope[:joins]))} "
+          sql << "FROM #{(scope && scope[:from]) || quoted_table_name} "
+          sql << join_dependency.join_associations.collect{|join| join.association_join }.join
+
+          add_joins!(sql, options[:joins], scope)
+          add_conditions!(sql, options[:conditions], scope)
+          add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
+
+          add_group!(sql, options[:group], options[:having], scope)
+          add_order!(sql, options[:order], scope)
+          add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
+          add_lock!(sql, options, scope)
+
+          return sanitize_sql(sql)
+        end
+
+        # Use carefully this method! It might get lost with different classes 
+        # scopes or different types of joins. 
+        def 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
 end
...	...	@@ -43,7 +43,12 @@ class Person < Profile
43	43	alias_method_chain :has_permission?, :plugins
44	44
45	45	def memberships
46		- Profile.memberships_of(self)
	46	+ scopes = []
	47	+ plugins_scopes = plugins.dispatch_scopes(:person_memberships, self)
	48	+ scopes = plugins_scopes unless plugins_scopes.first.blank?
	49	+ scopes << Profile.memberships_of(self)
	50	+ return scopes.first if scopes.size == 1
	51	+ ScopeTool.union *scopes
47	52	end
48	53
49	54	def memberships_by_role(role)
...	...
...	...	@@ -84,7 +84,8 @@ class Profile < ActiveRecord::Base
84	84	def members
85	85	scopes = plugins.dispatch_scopes(:organization_members, self)
86	86	scopes << Person.members_of(self)
87		- scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
	87	+ return scopes.first if scopes.size == 1
	88	+ ScopeTool.union *scopes
88	89	end
89	90
90	91	def members_count
...	...
...	...	@@ -0,0 +1,6 @@
	1	+Given /^"([^\"])" is a sub organization of "([^\"])"$/ do \|child, parent\|
	2	+ child = Organization.find_by_name(child) \|\| Organization[child]
	3	+ parent = Organization.find_by_name(parent) \|\| Organization[parent]
	4	+
	5	+ SubOrganizationsPlugin::Relation.add_children(parent, child)
	6	+end
...	...
...	...	@@ -114,6 +114,13 @@ module NavigationHelpers
114	114	when /^(.+)'s members page/
115	115	'/profile/%s/members' % profile_identifier($1)
116	116
	117	+ when /^(.+)'s "(.+)" page from "(.)" of "(.)" plugin/
	118	+ profile = $1
	119	+ action = $2
	120	+ plugin_name = $4.underscore
	121	+ controller_type = $3.constantize.superclass.to_s.underscore.gsub(/_controller/, "")
	122	+ "/#{controller_type}/#{profile}/plugin/#{plugin_name}/#{action}"
	123	+
117	124	else
118	125	begin
119	126	page_name =~ /the (.*) page/
...	...
...	...	@@ -372,6 +372,13 @@ class Noosfero::Plugin
372	372	nil
373	373	end
374	374
	375	+ # -> Extends person memberships list
	376	+ # returns = An instance of ActiveRecord::NamedScope::Scope retrived through
	377	+ # Person.memberships_of method.
	378	+ def person_memberships(person)
	379	+ nil
	380	+ end
	381	+
375	382	# -> Extends person permission access
376	383	# returns = boolean
377	384	def has_permission?(person, permission, target)
...	...
...	...	@@ -0,0 +1,15 @@
	1	+module ScopeTool
	2	+
	3	+ # Sum scope results by SQL, allowing post filtering of the group.
	4	+ def union(*scopes)
	5	+ model = scopes.first.class_name.constantize
	6	+ scopes = scopes.map &:to_sql
	7	+ model.from "(\n#{scopes.join("\nUNION\n")}\n) as #{model.table_name}"
	8	+ end
	9	+
	10	+ class << self
	11	+ # Allows to use `ScopeTool.method()` anywhere.
	12	+ include ScopeTool
	13	+ end
	14	+
	15	+end
...	...
...	...	@@ -0,0 +1,45 @@
	1	+class SubOrganizationsPluginProfileController < ProfileController
	2	+ append_view_path File.join(File.dirname(__FILE__) + '/../views')
	3	+
	4	+ before_filter :organizations_only
	5	+
	6	+ def children
	7	+ children = SubOrganizationsPlugin::Relation.children(profile)
	8	+ family_relation(children)
	9	+ render 'related_organizations'
	10	+ end
	11	+
	12	+ def parents
	13	+ parents = SubOrganizationsPlugin::Relation.parents(profile)
	14	+ family_relation(parents)
	15	+ render 'related_organizations'
	16	+ end
	17	+
	18	+ private
	19	+
	20	+ def family_relation(_profile)
	21	+ @communities = _profile.communities
	22	+ @enterprises = _profile.enterprises
	23	+ @full = true
	24	+
	25	+ if !params[:type] and !params[:display]
	26	+ @communities = SubOrganizationsPlugin.limit(@communities)
	27	+ @enterprises = SubOrganizationsPlugin.limit(@enterprises)
	28	+ @full = false
	29	+ elsif !params[:type]
	30	+ @total = _profile
	31	+ @total = @total.paginate(:per_page => 2, :page => params[:npage])
	32	+ if params[:display] == 'compact'
	33	+ @full = false
	34	+ end
	35	+ else
	36	+ @communities = @communities.paginate(:per_page => 2, :page => params[:npage])
	37	+ @enterprises = @enterprises.paginate(:per_page => 2, :page => params[:npage])
	38	+ end
	39	+ end
	40	+
	41	+ def organizations_only
	42	+ render_not_found if !profile.organization?
	43	+ end
	44	+
	45	+end
...	...
...	...	@@ -0,0 +1,62 @@
	1	+Feature: related_organizations_block
	2	+ As a user
	3	+ I want my organizations to have blocks that lists it's related-organizations
	4	+ In order to have quick access to it's related-organizations
	5	+
	6	+ Background:
	7	+ Given "SubOrganizations" plugin is enabled
	8	+ And the following users
	9	+ \| login \| name \|
	10	+ \| homer \| Homer \|
	11	+ And the following community
	12	+ \| identifier \| name \| owner \|
	13	+ \| springfield \| Springfield \| homer \|
	14	+ \| moe \| Moe's \| homer \|
	15	+ And the following enterprise
	16	+ \| identifier \| name \| owner \|
	17	+ \| duff \| Duff \| homer \|
	18	+ And "moe" is a sub organization of "springfield"
	19	+ And "duff" is a sub organization of "springfield"
	20	+ And I am logged in as "homer"
	21	+ And I go to springfield's control panel
	22	+
	23	+ Scenario: display sub organizations block add option
	24	+ When I follow "Edit sideboxes"
	25	+ And I follow "Add a block"
	26	+ Then I should see "Related Organizations"
	27	+
	28	+ Scenario: display both sub types on block
	29	+ When I follow "Edit sideboxes"
	30	+ And I follow "Add a block"
	31	+ And I choose "Related Organizations"
	32	+ And I press "Add"
	33	+ Then I should see "Moe's" within ".related-organizations-block"
	34	+ And I should see "Duff" within ".related-organizations-block"
	35	+
	36	+ Scenario: display only sub-communities
	37	+ Given the following blocks
	38	+ \| owner \| type \|
	39	+ \| springfield \| RelatedOrganizationsBlock \|
	40	+ When I follow "Edit sideboxes"
	41	+ And I follow "Edit" within ".related-organizations-block"
	42	+ And I select "Community" from "block_organization_type"
	43	+ And I press "Save"
	44	+ Then I should see "Moe's" within ".related-organizations-block"
	45	+ And I should not see "Duff" within ".related-organizations-block"
	46	+
	47	+ Scenario: display both sub types on sub-organizations page
	48	+ When I go to springfield's "children" page from "SubOrganizationsPluginProfileController" of "SubOrganizations" plugin
	49	+ Then I should see "Moe's"
	50	+ And I should see "Duff"
	51	+
	52	+ Scenario: display only sub-communities on sub-organizations page
	53	+ Given the following blocks
	54	+ \| owner \| type \|
	55	+ \| springfield \| RelatedOrganizationsBlock \|
	56	+ When I follow "Edit sideboxes"
	57	+ And I follow "Edit" within ".related-organizations-block"
	58	+ And I select "Community" from "block_organization_type"
	59	+ And I press "Save"
	60	+ And I follow "View all" within ".related-organizations-block"
	61	+ Then I should see "Moe's" within ".profile-list"
	62	+ And I should not see "Duff" within ".profile-list"
...	...
...	...	@@ -0,0 +1,80 @@
	1	+Feature: sub_organizations_display
	2	+ As a user
	3	+ I want my organizations to have blocks that lists it's related-organizations
	4	+ In order to have quick access to it's related-organizations
	5	+
	6	+ Background:
	7	+ Given "SubOrganizations" plugin is enabled
	8	+ And the following users
	9	+ \| login \| name \|
	10	+ \| nelson \| Nelson \|
	11	+ And feature "enterprise_registration" is enabled on environment
	12	+ And the following community
	13	+ \| identifier \| name \| owner \| description \| city \| state \|
	14	+ \| springfield \| Springfield \| nelson \| Springfield description \| Los Angeles \| California \|
	15	+ \| moe \| Moe \| nelson \| Moe description \| Kansas \| Texas \|
	16	+ And the following enterprise
	17	+ \| identifier \| name \| owner \| description \| city \| state \|
	18	+ \| school \| School \| nelson \| School description \| Terra do Nunca \| Billy Jean \|
	19	+ And I am logged in as "nelson"
	20	+ And I go to springfield's control panel
	21	+ When I follow "Edit sideboxes"
	22	+ And I follow "Add a block"
	23	+ And I choose "Related Organizations"
	24	+ And I press "Add"
	25	+
	26	+ @selenium
	27	+ Scenario: Display the sub organization block when there is a sub enterprise and communitys
	28	+ When I go to springfield's control panel
	29	+ And I follow "Manage sub-groups"
	30	+ And I follow "Register a new sub-enterprise"
	31	+ And I fill in "Name" with "Bart"
	32	+ And I press "Next"
	33	+ Then I should see "Enterprise registration completed"
	34	+ And I am logged in as admin
	35	+ And I go to admin_user's control panel
	36	+ When I follow "Tasks" within ".control-panel"
	37	+ Then I should see "Nelson wants to create enterprise Bart."
	38	+ And the first mail is to admin_user@example.com
	39	+ And I choose "Accept"
	40	+ And I press "Apply!"
	41	+ And I am logged in as "nelson"
	42	+ When I go to springfield's control panel
	43	+ And I follow "Manage sub-groups"
	44	+ And I follow "Create a new sub-community"
	45	+ And I fill in "Name" with "Homer"
	46	+ And I press "Create"
	47	+ When I go to springfield's "children" page from "SubOrganizationsPluginProfileController" of "SubOrganizations" plugin
	48	+ Then I should see "Homer" within ".related-organizations-block"
	49	+ And I should see "Bart" within ".related-organizations-block"
	50	+
	51	+ Scenario: Display with compact mode
	52	+ Given "moe" is a sub organization of "springfield"
	53	+ And "school" is a sub organization of "springfield"
	54	+ When I go to springfield's homepage
	55	+ And I follow "View all" within ".related-organizations-block"
	56	+ Then I should see "Springfield's sub-communities"
	57	+ And I should see "Springfield's sub-enterprises"
	58	+
	59	+ Scenario: Display with full mode for sub-communities
	60	+ Given "moe" is a sub organization of "springfield"
	61	+ When I go to springfield's homepage
	62	+ And I follow "View all" within ".related-organizations-block"
	63	+ Then I should see "Springfield's sub-communities"
	64	+ And I follow "Full" within ".search-customize-options"
	65	+ Then I should see "Moe description" within ".related-organizations-description"
	66	+ And I should see "Kansas, Texas" within ".related-organizations-region-name"
	67	+
	68	+ Scenario: Display with full mode for sub-enterprises
	69	+ Given "school" is a sub organization of "springfield"
	70	+ When I go to springfield's homepage
	71	+ And I follow "View all" within ".related-organizations-block"
	72	+ And I should see "Springfield's sub-enterprises"
	73	+ And I follow "Full" within ".search-customize-options"
	74	+ Then I should see "School description" within ".related-organizations-description"
	75	+ And I should see "Terra do Nunca, Billy Jean" within ".related-organizations-region-name"
	76	+
	77	+ Scenario: Display message when display full block are empty
	78	+ Given I follow "View all" within ".related-organizations-block"
	79	+ Then I should see "There are no sub-communities yet."
	80	+ And I should see "There are no sub-enterprises yet."
...	...
...	...	@@ -0,0 +1,60 @@
	1	+class RelatedOrganizationsBlock < ProfileListBlock
	2	+
	3	+ settings_items :organization_type, :type => :string, :default => 'both'
	4	+
	5	+ @display_type = {:title => 'related', :action => 'children' }
	6	+
	7	+ def self.description
	8	+ __("#{@display_type[:title].capitalize} Organizations")
	9	+ end
	10	+
	11	+ def default_title
	12	+ case organization_type
	13	+ when 'enterprise'
	14	+ n__("{#} #{@display_type[:title]} enterprise", "{#} #{@display_type[:title]} enterprises", profile_count)
	15	+ when 'community'
	16	+ n__("{#} #{@display_type[:title]} community", "{#} #{@display_type[:title]} communities", profile_count)
	17	+ else
	18	+ n__("{#} #{@display_type[:title]} organization", "{#} #{@display_type[:title]} organizations", profile_count)
	19	+ end
	20	+ end
	21	+
	22	+ def help
	23	+ _("This block displays #{@display_type[:title]} organizations of this organization")
	24	+ end
	25	+
	26	+ def profiles
	27	+ organizations = related_organizations
	28	+ case organization_type
	29	+ when 'enterprise'
	30	+ organizations.enterprises
	31	+ when 'community'
	32	+ organizations.communities
	33	+ else
	34	+ organizations
	35	+ end
	36	+ end
	37	+
	38	+ def footer
	39	+ profile = self.owner
	40	+ type = self.organization_type
	41	+ params = {:profile => profile.identifier, :controller => 'sub_organizations_plugin_profile', :action => @display_type[:action]}
	42	+ params[:type] = type if type == 'enterprise' \|\| type == 'community'
	43	+ lambda do
	44	+ link_to _('View all'), params.merge(params)
	45	+ end
	46	+ end
	47	+
	48	+ def related_organizations
	49	+ profile = self.owner
	50	+ organizations = SubOrganizationsPlugin::Relation.parents(profile)
	51	+
	52	+ if organizations.blank?
	53	+ @display_type = {:title => 'sub', :action => 'children'}
	54	+ organizations = SubOrganizationsPlugin::Relation.children(profile)
	55	+ else
	56	+ @display_type = {:title => 'parent', :action => 'parents' }
	57	+ organizations
	58	+ end
	59	+ end
	60	+end
...	...