Merge remote-tracking branch 'upstream/pull/3361'

[rails.git] / app / views / api / users / _user.json.jbuilder

diff --git a/app/views/api/users/_user.json.jbuilder b/app/views/api/users/_user.json.jbuilder
index 9629e8fa50276a53770f1123023a2b46e1253c02..7659e4e110c5b40667cb681b21fb116f48295913 100644 (file)
--- a/app/views/api/users/_user.json.jbuilder
+++ b/app/views/api/users/_user.json.jbuilder
@@ -4,7 +4,7 @@ json.user do
   json.account_created user.creation_time.xmlschema
   json.description user.description if user.description
 
-  if current_user && current_user == user
+  if current_user && current_user == user && can?(:details, User)
     json.contributor_terms do
       json.agreed user.terms_agreed.present?
       json.pd user.consider_pd
@@ -45,7 +45,7 @@ json.user do
     end
   end
 
-  if current_user && current_user == user
+  if current_user && current_user == user && can?(:details, User)
     if user.home_lat && user.home_lon
       json.home do
         json.lat user.home_lat
@@ -54,11 +54,7 @@ json.user do
       end
     end
 
-    if user.languages
-      json.languages do
-        json.array! user.languages.split(",")
-      end
-    end
+    json.languages user.languages if user.languages?
 
     json.messages do
       json.received do
@@ -69,5 +65,7 @@ json.user do
         json.count user.sent_messages.size
       end
     end
+
+    json.email user.email if scope_enabled?(:read_email)
   end
 end