scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-03 04:27:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use name instead of display_name in the dashboard

Browse Source
This commit is contained in:
Pranav Raj Sreepuram
2020-10-13 13:03:55 +05:30
parent 2c324d9421
commit 4a2a309d18
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/dashboard/components/layout/Sidebar.vue
View File

@@ -208,8 +208,7 @@ export default {
accountLabels: 'labels/getLabelsOnSidebar', accountLabels: 'labels/getLabelsOnSidebar',
}), }),
currentUserAvailableName() { currentUserAvailableName() {
const { available_name: availableName } = this.currentUser; return this.currentUser.name;
return availableName;
}, },
showChangeAccountOption() { showChangeAccountOption() {
if (this.globalConfig.createNewAccountFromDashboard) { if (this.globalConfig.createNewAccountFromDashboard) {

4
app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
View File

@@ -32,7 +32,7 @@
<multiselect <multiselect
v-model="currentChat.meta.assignee" v-model="currentChat.meta.assignee"
:options="agentList" :options="agentList"
label="available_name" label="name"
:allow-empty="true" :allow-empty="true"
deselect-label="Remove" deselect-label="Remove"
placeholder="Select Agent" placeholder="Select Agent"
@@ -97,7 +97,7 @@ export default {
return [ return [
{ {
confirmed: true, confirmed: true,
available_name: 'None', name: 'None',
id: 0, id: 0,
role: 'agent', role: 'agent',
account_id: 0, account_id: 0,

2
app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
View File

@@ -15,7 +15,7 @@
v-model="selectedAgents" v-model="selectedAgents"
:options="agentList" :options="agentList"
track-by="id" track-by="id"
label="available_name" label="name"
:multiple="true" :multiple="true"
:close-on-select="false" :close-on-select="false"
:clear-on-select="false" :clear-on-select="false"

2
app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
View File

@@ -180,7 +180,7 @@
v-model="selectedAgents" v-model="selectedAgents"
:options="agentList" :options="agentList"
track-by="id" track-by="id"
label="available_name" label="name"
:multiple="true" :multiple="true"
:close-on-select="false" :close-on-select="false"
:clear-on-select="false" :clear-on-select="false"

2
app/models/conversation.rb
View File

@@ -157,7 +157,7 @@ class Conversation < ApplicationRecord
def create_activity def create_activity
return unless Current.user return unless Current.user
user_name = Current.user&.available_name user_name = Current.user.name
create_status_change_message(user_name) if saved_change_to_status? create_status_change_message(user_name) if saved_change_to_status?
create_assignee_change(user_name) if saved_change_to_assignee_id? create_assignee_change(user_name) if saved_change_to_assignee_id?