KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'hotfix/1.2.2' into develop

Browse source
This commit is contained in:
Pranav Raj Sreepuram 2020-03-09 10:01:15 +05:30
commit 2a6670f0da
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
View file

@ -108,10 +108,9 @@ export default {
return channel; return channel;
}, },
conversationType() { conversationType() {
const { const { additional_attributes: additionalAttributes } = this.currentChat;
additional_attributes: additionalAttributes = {}, const type = additionalAttributes ? additionalAttributes.type : '';
} = this.currentChat; return type || '';
return additionalAttributes.type || '';
}, },
maxLength() { maxLength() {
if (this.channelType === 'Channel::FacebookPage') { if (this.channelType === 'Channel::FacebookPage') {

10
db/seeds.rb
View file

@ -17,5 +17,13 @@ InboxMember.create!(user: user, inbox: inbox)
contact = Contact.create!(name: 'jane', email: 'jane@example.com', phone_number: '0000', account: account) contact = Contact.create!(name: 'jane', email: 'jane@example.com', phone_number: '0000', account: account)
contact_inbox = ContactInbox.create!(inbox: inbox, contact: contact, source_id: user.id) contact_inbox = ContactInbox.create!(inbox: inbox, contact: contact, source_id: user.id)
conversation = Conversation.create!(account: account, inbox: inbox, status: :open, assignee: user, contact: contact, contact_inbox: contact_inbox) conversation = Conversation.create!(
account: account,
inbox: inbox,
status: :open,
assignee: user,
contact: contact,
contact_inbox: contact_inbox,
additional_attributes: {}
)
Message.create!(content: 'Hello', account: account, inbox: inbox, conversation: conversation, message_type: :incoming) Message.create!(content: 'Hello', account: account, inbox: inbox, conversation: conversation, message_type: :incoming)