diff --git a/plugins/sub_organizations/controllers/sub_organizations_plugin_myprofile_controller.rb b/plugins/sub_organizations/controllers/sub_organizations_plugin_myprofile_controller.rb
index 9d5100f..637c719 100644
--- a/plugins/sub_organizations/controllers/sub_organizations_plugin_myprofile_controller.rb
+++ b/plugins/sub_organizations/controllers/sub_organizations_plugin_myprofile_controller.rb
@@ -5,12 +5,12 @@ class SubOrganizationsPluginMyprofileController < MyProfileController
protect 'edit_profile', :profile
def index
- @children = SubOrganizationsPlugin::Relation.children(profile)
+ @children = Organization.children(profile)
@tokenized_children = prepare_to_token_input(@children)
- @pending_children = SubOrganizationsPlugin::ApprovePaternityRelation.pending_children(profile)
+ @pending_children = Organization.pending_children(profile)
if request.post?
begin
- original = SubOrganizationsPlugin::Relation.children(profile)
+ original = Organization.children(profile)
requested = Organization.find(params[:q].split(','))
added = requested - original
removed = original - requested
@@ -37,8 +37,8 @@ class SubOrganizationsPluginMyprofileController < MyProfileController
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)
+ Organization.children(organization).blank? &&
+ !Organization.pending_children(profile).include?(organization)
}).to_json
end
diff --git a/plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb b/plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb
index f9c2074..518094e 100644
--- a/plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb
+++ b/plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb
@@ -4,13 +4,13 @@ class SubOrganizationsPluginProfileController < ProfileController
before_filter :organizations_only
def children
- children = SubOrganizationsPlugin::Relation.children(profile)
+ children = Organization.children(profile)
family_relation(children)
render 'related_organizations'
end
def parents
- parents = SubOrganizationsPlugin::Relation.parents(profile)
+ parents = Organization.parents(profile)
family_relation(parents)
render 'related_organizations'
end
diff --git a/plugins/sub_organizations/lib/ext/organization.rb b/plugins/sub_organizations/lib/ext/organization.rb
index 5626fa1..fae325d 100644
--- a/plugins/sub_organizations/lib/ext/organization.rb
+++ b/plugins/sub_organizations/lib/ext/organization.rb
@@ -2,6 +2,8 @@ require_dependency 'organization'
class Organization
settings_items :sub_organizations_plugin_parent_to_be
+ attr_accessible :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)
@@ -10,4 +12,27 @@ class Organization
end
FIELDS << 'sub_organizations_plugin_parent_to_be'
+
+ scope :children, lambda { |parent|
+ options = {
+ :joins => "inner join sub_organizations_plugin_relations as relations on profiles.id=relations.child_id",
+ :conditions => ["relations.parent_id = ?", parent.id]
+ }
+ }
+
+ scope :parents, lambda { |*children|
+ options = {
+ :joins => "inner join sub_organizations_plugin_relations as relations on profiles.id=relations.parent_id",
+ :conditions => ["relations.child_id in (?)", children.map(&:id)]
+ }
+ }
+
+ scope :pending_children, lambda { |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]
+ }
+ }
+
end
diff --git a/plugins/sub_organizations/lib/related_organizations_block.rb b/plugins/sub_organizations/lib/related_organizations_block.rb
index 6f2123b..84f1711 100644
--- a/plugins/sub_organizations/lib/related_organizations_block.rb
+++ b/plugins/sub_organizations/lib/related_organizations_block.rb
@@ -2,25 +2,29 @@ class RelatedOrganizationsBlock < ProfileListBlock
settings_items :organization_type, :type => :string, :default => 'both'
- @display_type = {:title => 'related', :action => 'children' }
+ attr_accessible :organization_type
def self.description
- __("#{@display_type[:title].capitalize} Organizations")
+ _("Related Organizations")
+ end
+
+ def display_type
+ @display_type ||= {:title => 'related', :action => 'children' }
end
def default_title
case organization_type
when 'enterprise'
- n__("{#} #{@display_type[:title]} enterprise", "{#} #{@display_type[:title]} enterprises", profile_count)
+ n_("{#} #{display_type[:title]} enterprise", "{#} #{display_type[:title]} enterprises", profile_count)
when 'community'
- n__("{#} #{@display_type[:title]} community", "{#} #{@display_type[:title]} communities", profile_count)
+ n_("{#} #{display_type[:title]} community", "{#} #{display_type[:title]} communities", profile_count)
else
- n__("{#} #{@display_type[:title]} organization", "{#} #{@display_type[:title]} organizations", profile_count)
+ 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")
+ _("This block displays #{display_type[:title]} organizations of this organization")
end
def profiles
@@ -38,20 +42,20 @@ class RelatedOrganizationsBlock < ProfileListBlock
def footer
profile = self.owner
type = self.organization_type
- params = {:profile => profile.identifier, :controller => 'sub_organizations_plugin_profile', :action => @display_type[:action]}
+ params = {:profile => profile.identifier, :controller => 'sub_organizations_plugin_profile', :action => display_type[:action]}
params[:type] = type if type == 'enterprise' || type == 'community'
- lambda do
+ proc do
link_to _('View all'), params.merge(params)
end
end
def related_organizations
profile = self.owner
- organizations = SubOrganizationsPlugin::Relation.parents(profile)
+ organizations = Organization.parents(profile)
if organizations.blank?
@display_type = {:title => 'sub', :action => 'children'}
- organizations = SubOrganizationsPlugin::Relation.children(profile)
+ organizations = Organization.children(profile)
else
@display_type = {:title => 'parent', :action => 'parents' }
organizations
diff --git a/plugins/sub_organizations/lib/sub_organizations_plugin.rb b/plugins/sub_organizations/lib/sub_organizations_plugin.rb
index 46c0e24..b76eb30 100644
--- a/plugins/sub_organizations/lib/sub_organizations_plugin.rb
+++ b/plugins/sub_organizations/lib/sub_organizations_plugin.rb
@@ -19,7 +19,7 @@ class SubOrganizationsPlugin < Noosfero::Plugin
end
def control_panel_buttons
- if context.profile.organization? && SubOrganizationsPlugin::Relation.parents(context.profile).blank?
+ if context.profile.organization? && Organization.parents(context.profile).blank?
{ :title => _('Manage sub-groups'), :icon => 'groups', :url => {:controller => 'sub_organizations_plugin_myprofile'} }
end
end
@@ -29,17 +29,17 @@ class SubOrganizationsPlugin < Noosfero::Plugin
end
def organization_members(organization)
- children = SubOrganizationsPlugin::Relation.children(organization)
- Person.members_of(children) if children.present?
+ children = Organization.children(organization)
+ Person.members_of(children.all) if children.present?
end
def person_memberships(person)
- SubOrganizationsPlugin::Relation.parents(*Profile.memberships_of(person))
+ Organization.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|
+ Organization.parents(target).map do |parent|
person.has_permission_without_plugins?(permission, parent)
end.include?(true)
end
diff --git a/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity.rb b/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity.rb
index 743dcc6..e1e28de 100644
--- a/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity.rb
+++ b/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity.rb
@@ -13,7 +13,7 @@ class SubOrganizationsPlugin::ApprovePaternity < Task
end
def parent
- SubOrganizationsPlugin::ApprovePaternityRelation.parent(self)
+ SubOrganizationsPlugin::ApprovePaternityRelation.parent_approval(self)
end
def title
diff --git a/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb b/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb
index a1adb7d..03375fa 100644
--- a/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb
+++ b/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb
@@ -5,19 +5,12 @@ class SubOrganizationsPlugin::ApprovePaternityRelation < Noosfero::Plugin::Activ
validates_presence_of :task, :parent, :child
+ attr_accessible :task, :parent, :child
+
class << self
- def parent(task)
+ def parent_approval(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
diff --git a/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb b/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb
index 08e00ed..3c3c063 100644
--- a/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb
+++ b/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb
@@ -7,41 +7,25 @@ class SubOrganizationsPlugin::Relation < Noosfero::Plugin::ActiveRecord
validate :no_cyclical_reference, :if => 'parent.present? && child.present?'
validate :no_multi_level, :if => 'parent.present? && child.present?'
+ attr_accessible :parent, :child
+
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)
+ if Organization.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?
+ if Organization.parents(parent).present? || Organization.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(*children)
- options = {
- :select => "profiles.*",
- :joins => "inner join sub_organizations_plugin_relations as relations on profiles.id=relations.parent_id",
- :conditions => ["relations.child_id in (?)", children.map(&:id)]
- }
- ActiveRecord::NamedScope::Scope.new(Organization, options)
- end
-
def add_children(parent, *children)
children.each {|child| create!(:parent => parent, :child => child)}
end
diff --git a/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb b/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb
index 46bb609..8797dde 100644
--- a/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb
+++ b/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb
@@ -60,7 +60,7 @@ class SubOrganizationsPluginMyprofileControllerTest < ActionController::TestCase
post :index, :profile => organization.identifier, :q => [org2,org3,org4].map(&:id).join(',')
- children = SubOrganizationsPlugin::Relation.children(organization)
+ children = Organization.children(organization)
assert_not_includes children, org1
assert_includes children, org2
assert_not_includes children, org3
@@ -68,7 +68,7 @@ class SubOrganizationsPluginMyprofileControllerTest < ActionController::TestCase
SubOrganizationsPlugin::ApprovePaternity.all.map(&:finish)
- children = SubOrganizationsPlugin::Relation.children(organization)
+ children = Organization.children(organization)
assert_not_includes children, org1
assert_includes children, org2
assert_includes children, org3
@@ -80,10 +80,10 @@ class SubOrganizationsPluginMyprofileControllerTest < ActionController::TestCase
org2 = fast_create(Organization)
org2.add_admin(person)
- assert_difference SubOrganizationsPlugin::ApprovePaternity, :count, 1 do
+ 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
+ assert_includes Organization.children(organization), org2
end
should 'not access index if dont have permission' do
@@ -94,7 +94,7 @@ class SubOrganizationsPluginMyprofileControllerTest < ActionController::TestCase
get :index, :profile => organization.identifier
assert_response 403
- assert_template 'access_denied.rhtml'
+ assert_template 'access_denied'
end
should 'not search organizations if dont have permission' do
@@ -107,7 +107,7 @@ class SubOrganizationsPluginMyprofileControllerTest < ActionController::TestCase
get :search_organization, :profile => organization.identifier, :q => 'sampl'
assert_response 403
- assert_template 'access_denied.rhtml'
+ assert_template 'access_denied'
end
end
diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb
index 2d5c78a..2141887 100644
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb
+++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb
@@ -13,7 +13,7 @@ class SubOrganizationsPlugin::ApprovePaternityRelationTest < ActiveSupport::Test
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
+ assert_equal SubOrganizationsPlugin::ApprovePaternityRelation.parent_approval(task), org1
end
should 'list pending children' do
@@ -25,8 +25,8 @@ class SubOrganizationsPlugin::ApprovePaternityRelationTest < ActiveSupport::Test
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
+ assert_includes Organization.pending_children(organization), org1
+ assert_includes Organization.pending_children(organization), org2
+ assert_not_includes Organization.pending_children(organization), org3
end
end
diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb
index e58062f..aa27067 100644
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb
+++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb
@@ -11,7 +11,7 @@ class SubOrganizationsPlugin::ApprovePaternityTest < ActiveSupport::TestCase
should 'create relation after creation' do
org1 = fast_create(Organization)
org2 = fast_create(Organization)
- assert_difference SubOrganizationsPlugin::ApprovePaternityRelation, :count, 1 do
+ 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
@@ -21,9 +21,9 @@ class SubOrganizationsPlugin::ApprovePaternityTest < ActiveSupport::TestCase
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
+ assert_not_includes Organization.children(org1), org2
task.finish
- assert_includes SubOrganizationsPlugin::Relation.children(org1), org2
+ assert_includes Organization.children(org1), org2
end
end
diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb
index b9a70c2..78458e9 100644
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb
+++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb
@@ -13,11 +13,11 @@ class OrganizationTest < ActiveSupport::TestCase
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 = build(Organization, :identifier => 'some-org',:name => 'Some Org', :sub_organizations_plugin_parent_to_be => parent.id)
+ assert_not_includes Organization.children(parent), organization
organization.save!
- assert_includes SubOrganizationsPlugin::Relation.children(parent), organization
+ assert_includes Organization.children(parent), organization
end
end
diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb
index a30a7e3..bff92fa 100644
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb
+++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb
@@ -8,12 +8,12 @@ class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
relation.parent = org
relation.valid?
- assert relation.errors.invalid?(:child)
+ assert relation.errors.include?(:child)
relation.parent = nil
relation.child = org
relation.valid?
- assert relation.errors.invalid?(:parent)
+ assert relation.errors.include?(:parent)
end
should 'relate two organizations' do
@@ -27,9 +27,9 @@ class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
should 'not allow self relation' do
org = fast_create(Organization)
- relation = SubOrganizationsPlugin::Relation.new(:parent_id => org, :child_id => org)
+ relation = SubOrganizationsPlugin::Relation.new(:parent => org, :child => org)
assert !relation.valid?
- assert relation.errors.invalid?(:child)
+ assert relation.errors.include?(:child)
end
should 'be able to retrieve parents of an organization' do
@@ -39,8 +39,8 @@ class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
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
+ assert_includes Organization.parents(child), parent1
+ assert_includes Organization.parents(child), parent2
end
should 'be able to retrieve children of an organization' do
@@ -50,8 +50,8 @@ class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
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
+ assert_includes Organization.children(parent), child1
+ assert_includes Organization.children(parent), child2
end
should 'not allow cyclical reference' do
@@ -61,7 +61,7 @@ class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
relation = SubOrganizationsPlugin::Relation.new(:parent => org2, :child => org1)
assert !relation.valid?
- assert relation.errors.invalid?(:child)
+ assert relation.errors.include?(:child)
end
should 'not allow multi-level paternity' do
@@ -73,10 +73,10 @@ class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
r2 = SubOrganizationsPlugin::Relation.new(:parent => org3, :child => org1)
assert !r1.valid?
- assert r1.errors.invalid?(:child)
+ assert r1.errors.include?(:child)
assert !r2.valid?
- assert r2.errors.invalid?(:child)
+ assert r2.errors.include?(:child)
end
should 'add children' do
@@ -86,11 +86,11 @@ class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
org4 = fast_create(Organization)
SubOrganizationsPlugin::Relation.add_children(org1,org2)
- assert_includes SubOrganizationsPlugin::Relation.children(org1), org2
+ assert_includes Organization.children(org1), org2
SubOrganizationsPlugin::Relation.add_children(org1,org3,org4)
- assert_includes SubOrganizationsPlugin::Relation.children(org1), org3
- assert_includes SubOrganizationsPlugin::Relation.children(org1), org4
+ assert_includes Organization.children(org1), org3
+ assert_includes Organization.children(org1), org4
end
should 'remove children' do
@@ -101,10 +101,10 @@ class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase
SubOrganizationsPlugin::Relation.add_children(org1,org2,org3,org4)
SubOrganizationsPlugin::Relation.remove_children(org1,org2)
- assert_not_includes SubOrganizationsPlugin::Relation.children(org1), org2
+ assert_not_includes Organization.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
+ assert_not_includes Organization.children(org1), org3
+ assert_not_includes Organization.children(org1), org4
end
end
diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb
index a1b45ff..142867a 100644
--- a/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb
+++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb
@@ -29,7 +29,7 @@ class SubOrganizationsTest < ActiveSupport::TestCase
org1_members = plugin.organization_members(org1)
- assert_equal ActiveRecord::NamedScope::Scope, org1_members.class
+ assert_equal ActiveRecord::Relation, org1_members.class
assert_not_includes org1_members, member1
assert_includes org1_members, member2
assert_includes org1_members, member3
@@ -59,7 +59,7 @@ class SubOrganizationsTest < ActiveSupport::TestCase
person1_memberships = plugin.person_memberships(person1)
person2_memberships = plugin.person_memberships(person2)
- assert_equal ActiveRecord::NamedScope::Scope, person1_memberships.class
+ assert_equal ActiveRecord::Relation, person1_memberships.class
assert_includes person1_memberships, org1
assert_not_includes person1_memberships, org2
assert_not_includes person1_memberships, org3
diff --git a/plugins/sub_organizations/views/box_organizer/_related_organizations_block.html.erb b/plugins/sub_organizations/views/box_organizer/_related_organizations_block.html.erb
new file mode 100644
index 0000000..2f68f5b
--- /dev/null
+++ b/plugins/sub_organizations/views/box_organizer/_related_organizations_block.html.erb
@@ -0,0 +1,7 @@
+
+
+ <%= 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) %>
+
+
diff --git a/plugins/sub_organizations/views/box_organizer/_related_organizations_block.rhtml b/plugins/sub_organizations/views/box_organizer/_related_organizations_block.rhtml
deleted file mode 100644
index 2f68f5b..0000000
--- a/plugins/sub_organizations/views/box_organizer/_related_organizations_block.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- <%= 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) %>
-
-
diff --git a/plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb b/plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb
index f936236..9d71554 100644
--- a/plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb
+++ b/plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb
@@ -9,10 +9,10 @@
<% end %>
-<% form_tag do %>
+<%= 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') %>
+ <%= 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 %>
<%= _('Fill in the search field to find the groups that should be added as sub-group of this organization:') %>
diff --git a/plugins/sub_organizations/views/sub_organizations_plugin_profile/_full_related_organizations.html.erb b/plugins/sub_organizations/views/sub_organizations_plugin_profile/_full_related_organizations.html.erb
new file mode 100644
index 0000000..76d75a6
--- /dev/null
+++ b/plugins/sub_organizations/views/sub_organizations_plugin_profile/_full_related_organizations.html.erb
@@ -0,0 +1,63 @@
+<% extend SubOrganizationsPlugin::SearchHelper %>
+
diff --git a/plugins/sub_organizations/views/sub_organizations_plugin_profile/_full_related_organizations.rhtml b/plugins/sub_organizations/views/sub_organizations_plugin_profile/_full_related_organizations.rhtml
deleted file mode 100644
index 646f086..0000000
--- a/plugins/sub_organizations/views/sub_organizations_plugin_profile/_full_related_organizations.rhtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<% extend SubOrganizationsPlugin::SearchHelper %>
-
diff --git a/plugins/sub_organizations/views/sub_organizations_plugin_profile/_related_organizations.html.erb b/plugins/sub_organizations/views/sub_organizations_plugin_profile/_related_organizations.html.erb
new file mode 100644
index 0000000..5ec3cc5
--- /dev/null
+++ b/plugins/sub_organizations/views/sub_organizations_plugin_profile/_related_organizations.html.erb
@@ -0,0 +1,26 @@
+
+
<%= _("#{profile.name}'s sub-#{organization_type.pluralize}") %>
+
+
+ <% organizations.each do |organization| %>
+ <%= profile_image_link(organization)%>
+ <% end %>
+
+ <% if organizations.length == 0 %>
+
<%= _("There are no sub-#{organization_type.pluralize} yet. " ) %>
+ <% 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 %>
+
-
<%= __("#{profile.name}'s sub-#{organization_type.pluralize}") %>
-
-
- <% organizations.each do |organization| %>
- <%= profile_image_link(organization)%>
- <% end %>
-
- <% if organizations.length == 0 %>
-
<%= __("There are no sub-#{organization_type.pluralize} yet. " ) %>
- <% 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 %>
-
+ <%= display_selectors(params[:display]) %>
+
+
+<% 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 %>
diff --git a/plugins/sub_organizations/views/sub_organizations_plugin_profile/related_organizations.rhtml b/plugins/sub_organizations/views/sub_organizations_plugin_profile/related_organizations.rhtml
deleted file mode 100644
index cfbebc0..0000000
--- a/plugins/sub_organizations/views/sub_organizations_plugin_profile/related_organizations.rhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<% extend SubOrganizationsPlugin::SearchHelper %>
-<% extend SubOrganizationsPlugin::RelationHelper %>
-
-
- <%= display_selectors(params[:display]) %>
-
-
-<% 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 %>
--
libgit2 0.21.2