From 90eb6e6b8ffdb67c5474de87269e89d3f272c88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 27 Dec 2013 16:59:50 +0100 Subject: [PATCH] FIX: only show edit reason when the user action is an EDIT --- app/serializers/user_action_serializer.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb index ffcc6505e6f..e2a1d9be473 100644 --- a/app/serializers/user_action_serializer.rb +++ b/app/serializers/user_action_serializer.rb @@ -25,7 +25,7 @@ class UserActionSerializer < ApplicationSerializer :edit_reason def excerpt - PrettyText.excerpt(object.cooked,300) if object.cooked + PrettyText.excerpt(object.cooked, 300) if object.cooked end def avatar_template @@ -39,10 +39,10 @@ class UserActionSerializer < ApplicationSerializer def acting_avatar_template avatar_for( - object.acting_email, - object.acting_use_uploaded_avatar, - object.acting_uploaded_avatar_template, - object.acting_uploaded_avatar_id + object.acting_email, + object.acting_use_uploaded_avatar, + object.acting_uploaded_avatar_template, + object.acting_uploaded_avatar_id ) end @@ -66,7 +66,12 @@ class UserActionSerializer < ApplicationSerializer object.post_type == Post.types[:moderator_action] end + def edit_reason + object.edit_reason if object.action_type == UserAction::EDIT + end + private + def avatar_for(email, use_uploaded_avatar, uploaded_avatar_template, uploaded_avatar_id) # NOTE: id is required for cases where the template is blank (during initial population) User.new(