[Git][noosfero/noosfero][master] sub-organizations: rename scope parents to parentz to avoid active_record method override

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
1445c0a7 by Rodrigo Souto at 2016-09-16T15:11:07-03:00
sub-organizations: rename scope parents to parentz to avoid active_record method override

- - - - -


6 changed files:

- plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb
- plugins/sub_organizations/lib/ext/organization.rb
- 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/test/unit/relation_test.rb


Changes:

=====================================
plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb
=====================================
--- a/plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb
+++ b/plugins/sub_organizations/controllers/sub_organizations_plugin_profile_controller.rb
@@ -10,7 +10,7 @@ class SubOrganizationsPluginProfileController < ProfileController
   end
 
   def parents
-    parents = Organization.parents(profile)
+    parents = Organization.parentz(profile)
     family_relation(parents)
     render 'related_organizations'
   end


=====================================
plugins/sub_organizations/lib/ext/organization.rb
=====================================
--- a/plugins/sub_organizations/lib/ext/organization.rb
+++ b/plugins/sub_organizations/lib/ext/organization.rb
@@ -18,7 +18,7 @@ class Organization
     where("relations.parent_id = ?", parent.id)
   }
 
-  scope :parents, -> *children {
+  scope :parentz, -> *children {
     joins("inner join sub_organizations_plugin_relations as relations on profiles.id=relations.parent_id").
     where("relations.child_id in (?)", children.map(&:id))
   }


=====================================
plugins/sub_organizations/lib/related_organizations_block.rb
=====================================
--- a/plugins/sub_organizations/lib/related_organizations_block.rb
+++ b/plugins/sub_organizations/lib/related_organizations_block.rb
@@ -41,7 +41,7 @@ class RelatedOrganizationsBlock < ProfileListBlock
 
   def related_organizations
     profile = self.owner
-    organizations = Organization.parents(profile)
+    organizations = Organization.parentz(profile)
 
     if organizations.blank?
       @display_type = {:title => 'sub', :action => 'children'}


=====================================
plugins/sub_organizations/lib/sub_organizations_plugin.rb
=====================================
--- 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? && Organization.parents(context.profile).blank?
+    if context.profile.organization? && Organization.parentz(context.profile).blank?
       { title: _('Manage sub-groups'), icon: 'groups', url: {profile: profile.identifier, controller: :sub_organizations_plugin_myprofile} }
     end
   end
@@ -34,12 +34,12 @@ class SubOrganizationsPlugin < Noosfero::Plugin
   end
 
   def person_memberships(person)
-    Organization.parents(*Profile.memberships_of(person))
+    Organization.parentz(*Profile.memberships_of(person))
   end
 
   def has_permission?(person, permission, target)
     if !target.kind_of?(Environment) && target.organization?
-      Organization.parents(target).map do |parent|
+      Organization.parentz(target).map do |parent|
         person.has_permission_without_plugins?(permission, parent)
       end.include?(true)
     end


=====================================
plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb
=====================================
--- a/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb
+++ b/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb
@@ -21,7 +21,7 @@ class SubOrganizationsPlugin::Relation < ApplicationRecord
   end
 
   def no_multi_level
-    if Organization.parents(parent).present? || Organization.children(child).present?
+    if Organization.parentz(parent).present? || Organization.children(child).present?
       errors.add(:child, _('multi-level paternity is not allowed.'))
     end
   end


=====================================
plugins/sub_organizations/test/unit/relation_test.rb
=====================================
--- a/plugins/sub_organizations/test/unit/relation_test.rb
+++ b/plugins/sub_organizations/test/unit/relation_test.rb
@@ -39,8 +39,8 @@ class RelationTest < ActiveSupport::TestCase
     SubOrganizationsPlugin::Relation.create!(:parent => parent1, :child => child)
     SubOrganizationsPlugin::Relation.create!(:parent => parent2, :child => child)
 
-    assert_includes Organization.parents(child), parent1
-    assert_includes Organization.parents(child), parent2
+    assert_includes Organization.parentz(child), parent1
+    assert_includes Organization.parentz(child), parent2
   end
 
   should 'be able to retrieve children of an organization' do



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/1445c0a767a994e4f680170e647314b301516bec
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160916/b979eb0a/attachment-0001.html>