github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-09 15:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use typeahead on conversations

Browse Source
This commit is contained in:
Augier
2016-09-30 12:04:04 +02:00
committed by Benjamin Neff
parent 5269a0d3c0
commit f2fdaf1daf
27 changed files with 749 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/contacts_controller.rb
View File

@@ -17,7 +17,8 @@ class ContactsController < ApplicationController
# Used for mentions in the publisher and pagination on the contacts page
format.json {
@people = if params[:q].present?
Person.search(params[:q], current_user, only_contacts: true).limit(15)
mutual = params[:mutual].present? && params[:mutual]
Person.search(params[:q], current_user, only_contacts: true, mutual: mutual).limit(15)
else
set_up_contacts_json
end