Convert tests using OAuth 1 tokens to use OAuth 2 tokens

[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 7659e4e110c5b40667cb681b21fb116f48295913..1a339f62805137307cdadc8a1db45a8bba0a6e80 100644 (file)
--- a/app/views/api/users/_user.json.jbuilder
+++ b/app/views/api/users/_user.json.jbuilder
@@ -1,7 +1,7 @@
 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
 
   if current_user && current_user == user && can?(:details, User)
   json.description user.description if user.description
 
   if current_user && current_user == user && can?(:details, User)


@@ -46,7 +46,7 @@ json.user do
   end
 
   if current_user && current_user == user && can?(:details, User)
   end
 
   if current_user && current_user == user && can?(:details, User)

-    if user.home_lat && user.home_lon
+    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