Download as
Browse Code »

Commit d01f1a4190da214d9d5904eb21b181c40304b61a

Authored by Larissa Reis
2 parents 34d3a283 6591bcb4
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'quick_bug_fix' into 'master' 

Quick bug fix: Missing brace on Person.rb

Missing brace "}" on Person.rb and identation fix

See merge request !452
Showing 1 changed file with 6 additions and 6 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @d01f1a4
@@ -25,7 +25,7 @@ class Person < Profile @@ -25,7 +25,7 @@ class Person < Profile
25 scope :not_members_of, lambda { |resources| 25 scope :not_members_of, lambda { |resources|
26 resources = [resources] if !resources.kind_of?(Array) 26 resources = [resources] if !resources.kind_of?(Array)
27 conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ') 27 conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
28 - { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions] 28 + { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions] }
29 } 29 }
30 30
31 scope :by_role, lambda { |roles| 31 scope :by_role, lambda { |roles|
@@ -64,9 +64,9 @@ roles] } @@ -64,9 +64,9 @@ roles] }
64 ScopeTool.union *scopes 64 ScopeTool.union *scopes
65 end 65 end
66 66
67 - def memberships_by_role(role)  
68 - memberships.where('role_assignments.role_id = ?', role.id)  
69 - end 67 + def memberships_by_role(role)
  68 + memberships.where('role_assignments.role_id = ?', role.id)
  69 + end
70 70
71 has_many :friendships, :dependent => :destroy 71 has_many :friendships, :dependent => :destroy
72 has_many :friends, :class_name => 'Person', :through => :friendships 72 has_many :friends, :class_name => 'Person', :through => :friendships
@@ -141,12 +141,12 @@ roles] } @@ -141,12 +141,12 @@ roles] }
141 end 141 end
142 142
143 def add_friend(friend, group = nil) 143 def add_friend(friend, group = nil)
144 - unless self.is_a_friend?(friend) 144 + unless self.is_a_friend?(friend)
145 friendship = self.friendships.build 145 friendship = self.friendships.build
146 friendship.friend = friend 146 friendship.friend = friend
147 friendship.group = group 147 friendship.group = group
148 friendship.save 148 friendship.save
149 - end 149 + end
150 end 150 end
151 151
152 def already_request_friendship?(person) 152 def already_request_friendship?(person)