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

[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 d89b42befcf8a8725e6332945d060cb5e6001034..1a339f62805137307cdadc8a1db45a8bba0a6e80 100644 (file)
--- a/app/views/api/users/_user.json.jbuilder
+++ b/app/views/api/users/_user.json.jbuilder
@@ -1,10 +1,10 @@
 json.user do
   json.id user.id
   json.display_name user.display_name
 json.user do
   json.id user.id
   json.display_name user.display_name

-  json.account_created user.creation_time.xmlschema
+  json.account_created user.created_at.xmlschema

   json.description user.description if user.description
 
   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
     json.contributor_terms do
       json.agreed user.terms_agreed.present?
       json.pd user.consider_pd


@@ -45,8 +45,8 @@ json.user do
     end
   end
 
     end
   end
 

-  if current_user && current_user == user
-    if user.home_lat && user.home_lon
+  if current_user && current_user == user && can?(:details, User)
+    if user.home_location?

       json.home do
         json.lat user.home_lat
         json.lon user.home_lon
       json.home do
         json.lat user.home_lat
         json.lon user.home_lon


@@ -65,5 +65,7 @@ json.user do
         json.count user.sent_messages.size
       end
     end
         json.count user.sent_messages.size
       end
     end

+
+    json.email user.email if scope_enabled?(:read_email)

   end
 end
   end
 end