sub_organizations_plugin: Add related organizations block

The following improvements have been made: - Created action that displays sub-organization and super organizations of a given organization. - Created a block that display related organizations. - List mother organizations to person's membership if he/she is member of a sub-organization. (ActionItem2499) (ActionItem2825) Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br> Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>

sub_organizations_plugin: Add related organizations block
The following improvements have been made: - Created action that displays sub-organization and super organizations of a given organization. - Created a block that display related organizations. - List mother organizations to person's membership if he/she is member of a sub-organization. (ActionItem2499) (ActionItem2825) Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br> Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Daniel
1 parent 609e37e4
Showing 19 changed files with 386 additions and 3 deletions Show diff stats
app/models/person.rb
features/step_definitions/sub_organizations_block_steps.rb
features/support/paths.rb
lib/noosfero/plugin.rb
plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb
plugins/sub_organizations/features/sub_organizations_block.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/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
plugins/sub_organizations/views/profile_design
plugins/sub_organizations/views/sub_organizations_plugin_profile/_related_organizations.rhtml
plugins/sub_organizations/views/sub_organizations_plugin_profile/related_organizations.rhtml
test/unit/person_test.rb
@@ -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)
@@ -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,25 @@
+class SubOrganizationsPluginProfileController < ProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  before_filter :organizations_only
+
+  def children
+    @organizations = SubOrganizationsPlugin::Relation.children(profile)
+
+    render 'related_organizations'
+  end
+
+  def parents
+    @organizations = SubOrganizationsPlugin::Relation.parents(profile)
+
+    render 'related_organizations'
+  end
+
+
+  private
+
+  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,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
   def self.plugin_name
@@ -23,6 +25,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 +46,10 @@ 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.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 @@
+../../../../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;
+}
@@ -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,16 @@
+<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>
+
+<% 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}") %>
+<% end %>
+
+</div><!-- fim class="common-profile-list-block" -->
@@ -0,0 +1,7 @@
+<% if params[:type] != 'enterprise' %>
+  <%= render :partial => 'sub_organizations_plugin_profile/related_organizations', :locals => {:organizations => @organizations.communities, :organization_type => 'community'} %>
+<% end %>
+
+<% if params[:type] != 'community' %>
+  <%= render :partial => 'sub_organizations_plugin_profile/related_organizations', :locals => {:organizations => @organizations.enterprises, :organization_type => 'enterprise'} %>
+<% 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,6 @@		@@ -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,6 +114,13 @@ module NavigationHelpers
114	when /^(.+)'s members page/	114	when /^(.+)'s members page/
115	'/profile/%s/members' % profile_identifier($1)	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	else	124	else
118	begin	125	begin
119	page_name =~ /the (.*) page/	126	page_name =~ /the (.*) page/
	@@ -372,6 +372,13 @@ class Noosfero::Plugin		@@ -372,6 +372,13 @@ class Noosfero::Plugin
372	nil	372	nil
373	end	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	# -> Extends person permission access	382	# -> Extends person permission access
376	# returns = boolean	383	# returns = boolean
377	def has_permission?(person, permission, target)	384	def has_permission?(person, permission, target)
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	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	+ @organizations = SubOrganizationsPlugin::Relation.children(profile)
	8	+
	9	+ render 'related_organizations'
	10	+ end
	11	+
	12	+ def parents
	13	+ @organizations = SubOrganizationsPlugin::Relation.parents(profile)
	14	+
	15	+ render 'related_organizations'
	16	+ end
	17	+
	18	+
	19	+ private
	20	+
	21	+ def organizations_only
	22	+ render_not_found if !profile.organization?
	23	+ end
	24	+
	25	+end
@@ -0,0 +1,62 @@		@@ -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,60 @@		@@ -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
		1	+require_dependency File.dirname(__FILE__) + '/related_organizations_block'
		2	+
1	class SubOrganizationsPlugin < Noosfero::Plugin	3	class SubOrganizationsPlugin < Noosfero::Plugin
2		4
3	def self.plugin_name	5	def self.plugin_name
	@@ -23,6 +25,10 @@ class SubOrganizationsPlugin < Noosfero::Plugin		@@ -23,6 +25,10 @@ class SubOrganizationsPlugin < Noosfero::Plugin
23	Person.members_of(children) if children.present?	25	Person.members_of(children) if children.present?
24	end	26	end
25		27
		28	+ def person_memberships(person)
		29	+ SubOrganizationsPlugin::Relation.parents(*Profile.memberships_of(person))
		30	+ end
		31	+
26	def has_permission?(person, permission, target)	32	def has_permission?(person, permission, target)
27	if !target.kind_of?(Environment) && target.organization?	33	if !target.kind_of?(Environment) && target.organization?
28	SubOrganizationsPlugin::Relation.parents(target).map do \|parent\|	34	SubOrganizationsPlugin::Relation.parents(target).map do \|parent\|
	@@ -40,4 +46,10 @@ class SubOrganizationsPlugin < Noosfero::Plugin		@@ -40,4 +46,10 @@ class SubOrganizationsPlugin < Noosfero::Plugin
40	parent_to_be = context.params[:sub_organizations_plugin_parent_to_be]	46	parent_to_be = context.params[:sub_organizations_plugin_parent_to_be]
41	{'sub_organizations_plugin_parent_to_be' => parent_to_be} if parent_to_be.present?	47	{'sub_organizations_plugin_parent_to_be' => parent_to_be} if parent_to_be.present?
42	end	48	end
		49	+
		50	+ def self.extra_blocks
		51	+ {
		52	+ RelatedOrganizationsBlock => {:type => [Enterprise, Community], :position => ['1', '2', '3']}
		53	+ }
		54	+ end
43	end	55	end
	@@ -33,11 +33,11 @@ class SubOrganizationsPlugin::Relation < Noosfero::Plugin::ActiveRecord		@@ -33,11 +33,11 @@ class SubOrganizationsPlugin::Relation < Noosfero::Plugin::ActiveRecord
33	ActiveRecord::NamedScope::Scope.new(Organization, options)	33	ActiveRecord::NamedScope::Scope.new(Organization, options)
34	end	34	end
35		35
36	- def parents(child)	36	+ def parents(*children)
37	options = {	37	options = {
38	:select => "profiles.*",	38	:select => "profiles.*",
39	:joins => "inner join sub_organizations_plugin_relations as relations on profiles.id=relations.parent_id",	39	:joins => "inner join sub_organizations_plugin_relations as relations on profiles.id=relations.parent_id",
40	- :conditions => ["relations.child_id = ?", child.id]	40	+ :conditions => ["relations.child_id in (?)", children.map(&:id)]
41	}	41	}
42	ActiveRecord::NamedScope::Scope.new(Organization, options)	42	ActiveRecord::NamedScope::Scope.new(Organization, options)
43	end	43	end
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../../../public/designs/themes/base/imgs/arrow-right-p.png
0	\ No newline at end of file	2	\ No newline at end of file
1	#content .token-input-list {	1	#content .token-input-list {
2	margin-bottom: 30px;	2	margin-bottom: 30px;
3	}	3	}
		4	+
		5	+.related-organizations-button-bar {
		6	+ padding-top: 40px;
		7	+ clear: both;
		8	+}
		9	+
		10	+.related-organizations-block .block-footer-content a {
		11	+ position: absolute;
		12	+ top: 2px;
		13	+ right: 0px;
		14	+ font-size: 11px;
		15	+ color: #000;
		16	+ text-decoration: none;
		17	+ padding-right: 15px;
		18	+ background: url(images/arrow-right-p.png) 100% 50% no-repeat;
		19	+}