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:
authorcmrd Senya <senya@riseup.net>2016-08-15 23:26:36 +0300
committercmrd Senya <senya@riseup.net>2016-08-15 23:43:24 +0300
commit4b3f36e92aed815e1d0ca8517f4eba7a924a28ab (patch)
treef543897c46f11c18ee8584fb9e69bce956eaa41d /app/controllers
parente712e4c92f7f5db8f57de537ec2ac02d328ea9d6 (diff)
Fix aspect dropdown when person is being fetched
fix #6989
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/people_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 5029ccc62..25b397ea7 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -62,7 +62,7 @@ class PeopleController < ApplicationController
self.formats = self.formats + [:html]
@answer_html = render_to_string :partial => 'people/person', :locals => @hashes.first
end
- render :json => { :search_count => @people.count, :search_html => @answer_html }.to_json
+ render json: {search_html: @answer_html, contacts: gon.preloads[:contacts]}.to_json
end
# renders the persons user profile page