Do not merge zoom/lat/lon options with oauth_return_url

[rails.git] / app / views / api / users / _user.xml.builder

diff --git a/app/views/api/users/_user.xml.builder b/app/views/api/users/_user.xml.builder
index 9092f2c96bacaaf1cb2233756716c41d36ecd0fc..9fb74826a017b87170ca3f0f0ac771bb433e0d97 100644 (file)
--- a/app/views/api/users/_user.xml.builder
+++ b/app/views/api/users/_user.xml.builder
@@ -1,6 +1,6 @@
 xml.tag! "user", :id => user.id,
                  :display_name => user.display_name,
 xml.tag! "user", :id => user.id,
                  :display_name => user.display_name,

-                 :account_created => user.creation_time.xmlschema do
+                 :account_created => user.created_at.xmlschema do

   xml.tag! "description", user.description if user.description
   if current_user && current_user == user && can?(:details, User)
     xml.tag! "contributor-terms", :agreed => user.terms_agreed.present?,
   xml.tag! "description", user.description if user.description
   if current_user && current_user == user && can?(:details, User)
     xml.tag! "contributor-terms", :agreed => user.terms_agreed.present?,


@@ -25,7 +25,7 @@ xml.tag! "user", :id => user.id,
     end
   end
   if current_user && current_user == user && can?(:details, User)
     end
   end
   if current_user && current_user == user && can?(:details, User)

-    if user.home_lat && user.home_lon
+    if user.home_location?

       xml.tag! "home", :lat => user.home_lat,
                        :lon => user.home_lon,
                        :zoom => user.home_zoom
       xml.tag! "home", :lat => user.home_lat,
                        :lon => user.home_lon,
                        :zoom => user.home_zoom


@@ -40,5 +40,6 @@ xml.tag! "user", :id => user.id,
                            :unread => user.new_messages.size
       xml.tag! "sent", :count => user.sent_messages.size
     end
                            :unread => user.new_messages.size
       xml.tag! "sent", :count => user.sent_messages.size
     end

+    xml.tag! "email", user.email if scope_enabled?(:read_email)

   end
 end
   end
 end