Download as
Browse Code »

Commit 6591bcb48804e7e00682391d61821ef95699848f

Authored by Tallys Martins
1 parent 34d3a283
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

Fixing identation and missing brace on person.rb

Showing 1 changed file with 6 additions and 6 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @6591bcb
... ... @@ -25,7 +25,7 @@ class Person < Profile
25 25 scope :not_members_of, lambda { |resources|
26 26 resources = [resources] if !resources.kind_of?(Array)
27 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 31 scope :by_role, lambda { |roles|
... ... @@ -64,9 +64,9 @@ roles] }
64 64 ScopeTool.union *scopes
65 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 71 has_many :friendships, :dependent => :destroy
72 72 has_many :friends, :class_name => 'Person', :through => :friendships
... ... @@ -141,12 +141,12 @@ roles] }
141 141 end
142 142  
143 143 def add_friend(friend, group = nil)
144   - unless self.is_a_friend?(friend)
  144 + unless self.is_a_friend?(friend)
145 145 friendship = self.friendships.build
146 146 friendship.friend = friend
147 147 friendship.group = group
148 148 friendship.save
149   - end
  149 + end
150 150 end
151 151  
152 152 def already_request_friendship?(person)
... ...