IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Use smaller messages for moderator actions.

Browse Source
This commit is contained in:
Robin Ward
2015-07-24 16:39:03 -04:00
parent 326b2812e4
commit bb93a345eb
25 changed files with 171 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/admin_post_serializer.rb
View File

@@ -46,7 +46,7 @@ class AdminPostSerializer < ApplicationSerializer
end
def moderator_action
object.post_type == Post.types[:moderator_action]
object.post_type == Post.types[:moderator_action] || object.post_type == Post.types[:small_action]
end
def deleted_by

7
app/serializers/post_serializer.rb
View File

@@ -57,7 +57,8 @@ class PostSerializer < BasicPostSerializer
:wiki,
:user_custom_fields,
:static_doc,
:via_email
:via_email,
:action_code
def initialize(object, opts)
super(object, opts)
@@ -281,6 +282,10 @@ class PostSerializer < BasicPostSerializer
scope.is_staff? ? object.version : object.public_version
end
def include_action_code?
object.action_code.present?
end
private
def post_actions

2
app/serializers/user_action_serializer.rb
View File

@@ -68,7 +68,7 @@ class UserActionSerializer < ApplicationSerializer
end
def moderator_action
object.post_type == Post.types[:moderator_action]
object.post_type == Post.types[:moderator_action] || object.post_type == Post.types[:small_action]
end
def include_reply_to_post_number?