invite-controller: simplify permission check

Rodrigo Souto
1 parent 6b78cf93
Showing 4 changed files with 13 additions and 5 deletions Show diff stats
app/controllers/public/invite_controller.rb
app/models/organization.rb
app/models/person.rb
app/models/profile.rb
@@ -85,10 +85,6 @@ class InviteController &lt; PublicController
   protected
   def check_permissions_to_invite
-    if profile.person? and !user.has_permission?(:manage_friends, profile) or
-      profile.community? and !user.has_permission?(:invite_members, profile)
-      render_access_denied
-    end
+    render_access_denied if !profile.allow_invitation_from?(user)
   end
-
 end
@@ -177,4 +177,8 @@ class Organization &lt; Profile
     self.visible = false
     save!
   end
+
+  def allow_invitation_from?(person)
+    (followed_by?(person) && self.allow_members_to_invite) || person.has_permission?('invite-members', self)
+  end
 end
@@ -514,6 +514,10 @@ class Person &lt; Profile
     suggestion.disable if suggestion
   end
+  def allow_invitation_from?(person)
+    person.has_permission?(:manage_friends, self)
+  end
+
   protected
   def followed_by?(profile)
@@ -992,4 +992,8 @@ private :generate_url, :url_options
     suggestion.disable if suggestion
   end
+  def allow_invitation_from(person)
+    false
+  end
+
 end
	@@ -177,4 +177,8 @@ class Organization < Profile		@@ -177,4 +177,8 @@ class Organization < Profile
177	self.visible = false	177	self.visible = false
178	save!	178	save!
179	end	179	end
		180	+
		181	+ def allow_invitation_from?(person)
		182	+ (followed_by?(person) && self.allow_members_to_invite) \|\| person.has_permission?('invite-members', self)
		183	+ end
180	end	184	end
	@@ -992,4 +992,8 @@ private :generate_url, :url_options		@@ -992,4 +992,8 @@ private :generate_url, :url_options
992	suggestion.disable if suggestion	992	suggestion.disable if suggestion
993	end	993	end
994		994
		995	+ def allow_invitation_from(person)
		996	+ false
		997	+ end
		998	+
995	end	999	end