Download as
Browse Code »

Commit d1f72816e963a4810014dbdd0ce8d4037245c3b9

Authored by Rodrigo Souto
1 parent 6b78cf93
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

invite-controller: simplify permission check

Showing 4 changed files with 13 additions and 5 deletions   Show diff stats
app/controllers/public/invite_controller.rb
  Diff comments   View file @d1f7281
... ... @@ -85,10 +85,6 @@ class InviteController < PublicController
85 85 protected
86 86  
87 87 def check_permissions_to_invite
88   - if profile.person? and !user.has_permission?(:manage_friends, profile) or
89   - profile.community? and !user.has_permission?(:invite_members, profile)
90   - render_access_denied
91   - end
  88 + render_access_denied if !profile.allow_invitation_from?(user)
92 89 end
93   -
94 90 end
... ...
app/models/organization.rb
  Diff comments   View file @d1f7281
... ... @@ -177,4 +177,8 @@ class Organization < Profile
177 177 self.visible = false
178 178 save!
179 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 184 end
... ...
app/models/person.rb
  Diff comments   View file @d1f7281
... ... @@ -514,6 +514,10 @@ class Person < Profile
514 514 suggestion.disable if suggestion
515 515 end
516 516  
  517 + def allow_invitation_from?(person)
  518 + person.has_permission?(:manage_friends, self)
  519 + end
  520 +
517 521 protected
518 522  
519 523 def followed_by?(profile)
... ...
app/models/profile.rb
  Diff comments   View file @d1f7281
... ... @@ -992,4 +992,8 @@ private :generate_url, :url_options
992 992 suggestion.disable if suggestion
993 993 end
994 994  
  995 + def allow_invitation_from(person)
  996 + false
  997 + end
  998 +
995 999 end
... ...