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

[rails.git] / app / views / api / user_blocks / _user_block.json.jbuilder

diff --git a/app/views/api/user_blocks/_user_block.json.jbuilder b/app/views/api/user_blocks/_user_block.json.jbuilder
index 3288dd6ada031db7f5f3668d7a1f224838326a2c..2e65b52dab8e14a964a4ae948dce2773436bf11e 100644 (file)
--- a/app/views/api/user_blocks/_user_block.json.jbuilder
+++ b/app/views/api/user_blocks/_user_block.json.jbuilder
@@ -1,13 +1,11 @@
-json.user_block do
-  json.id user_block.id
-  json.created_at user_block.created_at.xmlschema
-  json.updated_at user_block.updated_at.xmlschema
-  json.ends_at user_block.ends_at.xmlschema
-  json.needs_view user_block.needs_view
+json.id user_block.id
+json.created_at user_block.created_at.xmlschema
+json.updated_at user_block.updated_at.xmlschema
+json.ends_at user_block.ends_at.xmlschema
+json.needs_view user_block.needs_view

 
 

-  json.user :uid => user_block.user_id, :user => user_block.user.display_name
-  json.creator :uid => user_block.creator_id, :user => user_block.creator.display_name
-  json.revoker :uid => user_block.revoker_id, :user => user_block.revoker.display_name if user_block.revoker
+json.user :uid => user_block.user_id, :user => user_block.user.display_name
+json.creator :uid => user_block.creator_id, :user => user_block.creator.display_name
+json.revoker :uid => user_block.revoker_id, :user => user_block.revoker.display_name if user_block.revoker

 
 

-  json.reason user_block.reason
-end
+json.reason user_block.reason unless @skip_reason