Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen van Bergerem <svbergerem@online.de>2016-08-18 13:30:54 +0300
committerSteffen van Bergerem <svbergerem@online.de>2016-08-18 14:02:14 +0300
commit7b5ac656a7315bd775f8745fc3b3a4d46b344399 (patch)
treeef6a03029e10e2b9bd4d27e298f765361716fa21 /app/controllers
parent0a1a7b167f3ccbcb743c047e2659b82a33743fdb (diff)
Fix conversations autoSuggest showing non-mutual contacts
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/conversations_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index c765f4e01..11dccbd0a 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -104,7 +104,7 @@ class ConversationsController < ApplicationController
private
def contacts_data
- current_user.contacts.sharing.joins(person: :profile)
+ current_user.contacts.mutual.joins(person: :profile)
.pluck(*%w(contacts.id profiles.first_name profiles.last_name people.diaspora_handle))
.map {|contact_id, *name_attrs|
{value: contact_id, name: ERB::Util.h(Person.name_from_attrs(*name_attrs)) }