ActionItem5: changed the way of getting the memberships of a user

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@558 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem5: changed the way of getting the memberships of a user
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@558 3f533792-8f58-4932-b0fe-aaf55b0a4547
MoisesMachado
1 parent cc56cb65
Showing 4 changed files with 20 additions and 24 deletions Show diff stats
app/controllers/profile_admin/membership_editor_controller.rb
app/models/person.rb
test/unit/person_test.rb
test/unit/profile_test.rb
 class MembershipEditorController < ProfileAdminController
   def index
-    @memberships = Profile.find(:all, :include => 'role_assignments', :conditions => ['role_assignments.person_id = ?', current_user.person.id])
+    @memberships = current_user.person.memberships
   end
 end
@@ -10,7 +10,6 @@ class Person &lt; Profile
   has_one :person_info
   has_many :role_assignments
-  has_many :memberships, :through => :role_assignments, :source => 'resource', :class_name => 'Enterprise'
   def has_permission?(perm, res=nil)
     role_assignments.any? {|ra| ra.has_permission?(perm, res)}
@@ -30,27 +29,14 @@ class Person &lt; Profile
     new_conditions
   end
-  def profiles(conditions = {})
+  def memberships(conditions = {})
     Profile.find(
       :all, 
       :conditions => self.class.conditions_for_profiles(conditions, self), 
       :joins => "LEFT JOIN role_assignments ON profiles.id = role_assignments.resource_id AND role_assignments.resource_type = \"#{Profile.base_class.name}\"",
       :select => 'profiles.*')
   end
-
-  def enterprises(conditions = {})
-    profiles( ({:type => 'Enterprise'}).merge(conditions))
-  end
-
-  def pending_enterprises
-    enterprises :active => false
-  end
-
-  def active_enterprises
-    enterprises :active => true
-  end
-
   def info
     person_info
   end
@@ -19,7 +19,7 @@ class PersonTest &lt; Test::Unit::TestCase
     assert pe.save
     member_role = Role.create(:name => 'member')
     pr.affiliate(pe, member_role) 
-    assert pe.profiles.include?(pr)
+    assert pe.memberships.include?(pr)
   end
   def test_can_belongs_to_an_enterprise
@@ -29,7 +29,7 @@ class PersonTest &lt; Test::Unit::TestCase
     assert p.save
     member_role = Role.create(:name => 'member')
     e.affiliate(p, member_role)
-    assert p.enterprises.include?(e)
+    assert p.memberships.include?(e)
   end
   def test_can_have_user
@@ -65,15 +65,25 @@ class PersonTest &lt; Test::Unit::TestCase
   end
   should 'change the roles of the user' do
-    assert p = User.create(:login => 'jonh', :email => 'john@doe.org', :password => 'dhoe', :password_confirmation => 'dhoe').person
-    assert e = Enterprise.create(:identifier => 'enter')
-    assert r1 = Role.create(:name => 'associate')
+    p = User.create(:login => 'jonh', :email => 'john@doe.org', :password => 'dhoe', :password_confirmation => 'dhoe').person
+    e = Enterprise.create(:identifier => 'enter', :name => 'Enter')
+    r1 = Role.create(:name => 'associate')
     assert e.affiliate(p, r1)
-    assert r2 = Role.create(:name => 'partner')
+    r2 = Role.create(:name => 'partner')
     assert p.define_roles([r2], e)
-    p = Person.find(p.id)
+    p.reload
     assert p.role_assignments.any? {|ra| ra.role == r2}
     assert !p.role_assignments.any? {|ra| ra.role == r1}
   end
+  should 'report that the user has the permission' do
+    p = User.create(:login => 'jonh', :email => 'john@doe.org', :password => 'dhoe', :password_confirmation => 'dhoe').person
+    r = Role.create(:name => 'associate', :permissions => ['edit_profile'])
+    e = Enterprise.create(:identifier => 'enterpri', :name => 'Enterpri')
+    assert e.affiliate(p, r)
+    assert p.reload
+    assert e.reload
+    assert p.has_permission?('edit_profile', e)
+    assert !p.has_permission?('destroy_profile', e)
+  end
 end
@@ -84,7 +84,7 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert member_role.save
     assert pr.affiliate(pe, member_role)
-    assert pe.profiles.include?(pr)
+    assert pe.memberships.include?(pr)
   end
   def test_search
1	class MembershipEditorController < ProfileAdminController	1	class MembershipEditorController < ProfileAdminController
2		2
3	def index	3	def index
4	- @memberships = Profile.find(:all, :include => 'role_assignments', :conditions => ['role_assignments.person_id = ?', current_user.person.id])	4	+ @memberships = current_user.person.memberships
5	end	5	end
6	end	6	end
	@@ -84,7 +84,7 @@ class ProfileTest < Test::Unit::TestCase		@@ -84,7 +84,7 @@ class ProfileTest < Test::Unit::TestCase
84	assert member_role.save	84	assert member_role.save
85	assert pr.affiliate(pe, member_role)	85	assert pr.affiliate(pe, member_role)
86		86
87	- assert pe.profiles.include?(pr)	87	+ assert pe.memberships.include?(pr)
88	end	88	end
89		89
90	def test_search	90	def test_search