Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
This commit is contained in:
commit
9df38199ab
1 changed files with 2 additions and 2 deletions
|
|
@ -190,11 +190,11 @@ class User
|
||||||
end
|
end
|
||||||
|
|
||||||
def friend_by_id( id )
|
def friend_by_id( id )
|
||||||
friends.detect{|x| x.id == ensure_bson id }
|
friends.detect{|x| x.id == ensure_bson( id ) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def group_by_id( id )
|
def group_by_id( id )
|
||||||
groups.detect{|x| x.id == ensure_bson id }
|
groups.detect{|x| x.id == ensure_bson( id ) }
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue