Merge branch 'master' into moderation

[rails.git] / app / views / user / api_read.builder

diff --git a/app/views/user/api_read.builder b/app/views/user/api_read.builder
index 2b304f53ca2e618efa45a2a887c9eb6c831c9339..0e8bfa5eff34f1e5358fb75ceab8c6e36cf16558 100644 (file)
--- a/app/views/user/api_read.builder
+++ b/app/views/user/api_read.builder
@@ -3,16 +3,14 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
   xml.tag! "user", :id => @this_user.id,
                    :display_name => @this_user.display_name,
                    :account_created => @this_user.creation_time.xmlschema do
   xml.tag! "user", :id => @this_user.id,
                    :display_name => @this_user.display_name,
                    :account_created => @this_user.creation_time.xmlschema do

-    if @this_user.description
-      xml.tag! "description", @this_user.description
-    end
-    if @user && @user == @this_user
-      xml.tag! "contributor-terms", :agreed => !!@this_user.terms_agreed,
+    xml.tag! "description", @this_user.description if @this_user.description
+    if current_user && current_user == @this_user
+      xml.tag! "contributor-terms", :agreed => @this_user.terms_agreed.present?,

                                     :pd => @this_user.consider_pd
     else
                                     :pd => @this_user.consider_pd
     else

-      xml.tag! "contributor-terms", :agreed => !!@this_user.terms_agreed
+      xml.tag! "contributor-terms", :agreed => @this_user.terms_agreed.present?

     end
     end

-    if @this_user.image.file? or @this_user.image_use_gravatar
+    if @this_user.image.file? || @this_user.image_use_gravatar

       xml.tag! "img", :href => user_image_url(@this_user, :size => 256)
     end
     xml.tag! "roles" do
       xml.tag! "img", :href => user_image_url(@this_user, :size => 256)
     end
     xml.tag! "roles" do


@@ -30,8 +28,8 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
                            :active => @this_user.blocks_created.active.size
       end
     end
                            :active => @this_user.blocks_created.active.size
       end
     end

-    if @user && @user == @this_user
-      if @this_user.home_lat and @this_user.home_lon
+    if current_user && current_user == @this_user
+      if @this_user.home_lat && @this_user.home_lon

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