chore: Use full name in activity message, fix specs (#1339)

This commit is contained in:
Pranav Raj S
2020-10-14 00:16:35 +05:30
committed by GitHub
parent 4a2a309d18
commit 0bea0217b4
3 changed files with 11 additions and 11 deletions

View File

@@ -41,7 +41,7 @@
size="16px"
/>
<div class="sender--available-name">
{{ sender.available_name || sender.name }}
{{ sender.name }}
</div>
</div>
</div>
@@ -121,7 +121,7 @@ export default {
return this.data.message_type === 1 && !this.isHovered && sender
? {
content: `Sent by: ${sender.available_name || sender.name}`,
content: `Sent by: ${sender.name}`,
classes: 'top',
}
: false;

View File

@@ -214,7 +214,7 @@ class Conversation < ApplicationRecord
end
def create_assignee_change(user_name)
params = { assignee_name: assignee&.available_name, user_name: user_name }.compact
params = { assignee_name: assignee.name, user_name: user_name }.compact
key = assignee_id ? 'assigned' : 'removed'
key = 'self_assigned' if self_assign? assignee_id
content = I18n.t("conversations.activity.assignee.#{key}", **params)