Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] LiveChat switch department not working #11011

Merged
merged 19 commits into from
Aug 21, 2018
Merged

[FIX] LiveChat switch department not working #11011

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6dc4bc5
When a livechat visitor attempted to change the current department, t…
renatobecker Jun 5, 2018
0ee4d79
Merge branch 'develop' into fix-changing-livechat-visitor-department
renatobecker Jun 13, 2018
4c980c7
Merge branch 'develop' into fix-changing-livechat-visitor-department
renatobecker Jun 13, 2018
b4deb6e
Fixed the behaviour of the LiveChat department change.
renatobecker Jun 14, 2018
cdc7a4d
Merge branch 'develop' into fix-changing-livechat-visitor-department
ggazzo Jun 14, 2018
38872a0
Merge branch 'develop' into fix-changing-livechat-visitor-department
renatobecker Jun 14, 2018
cf34fb9
Merge branch 'fix-changing-livechat-visitor-department' of github.com…
renatobecker Jun 14, 2018
08e2df1
Invalid comments removed.
renatobecker Jun 14, 2018
f03652e
Merge branch 'develop' into fix-changing-livechat-visitor-department
renatobecker Jul 11, 2018
aee97ea
Merge branch 'develop' into fix-changing-livechat-visitor-department
renatobecker Aug 2, 2018
d6c795a
Fixed `RocketChat.Livechat.stream.emit` that was not being emitted.
renatobecker Aug 3, 2018
247db3e
Merge branch 'develop' into fix-changing-livechat-visitor-department
renatobecker Aug 3, 2018
19205b6
Merged `develop` into current branch.
renatobecker Aug 3, 2018
8592c7e
Merge branch 'develop' into fix-changing-livechat-visitor-department
renatobecker Aug 19, 2018
92f75c1
Fix eslint new rules.
renatobecker Aug 19, 2018
3353332
Fix eslint new rules.
renatobecker Aug 19, 2018
583317d
Fix eslint new really rules.
renatobecker Aug 19, 2018
9a98faa
Fix eslint new rules.
renatobecker Aug 19, 2018
3b5c72f
Merge branch 'develop' into fix-changing-livechat-visitor-department
sampaiodiego Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/rocketchat-livechat/.app/client/lib/chatMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ this.ChatMessages = class ChatMessages {
};
}

hideError();

Meteor.call('sendMessageLivechat', msgObject, agent, (error, result) => {
if (error) {
ChatMessage.update(msgObject._id, { $set: { error: true } });
Expand Down
4 changes: 4 additions & 0 deletions packages/rocketchat-livechat/.app/client/lib/error.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
this.showError = msg => {
$('.error').addClass('show').find('span').html(msg);
};

this.hideError = () => {
$('.error').removeClass('show');
};
2 changes: 1 addition & 1 deletion packages/rocketchat-livechat/server/lib/Livechat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ RocketChat.Livechat = {

const user = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1 } });
if (user) {
return Meteor.users.update(user._id, updateUser);
return LivechatVisitors.updateById(user._id, updateUser);
}
return false;
},
Expand Down