Add some variable checks

pull/5260/head
Diego Sampaio 9 years ago
parent f5023304c0
commit d7ecbe6d82
  1. 2
      packages/rocketchat-authorization/client/hasPermission.coffee
  2. 2
      packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js
  3. 3
      packages/rocketchat-livechat/server/lib/Livechat.js

@ -1,7 +1,7 @@
atLeastOne = (permissions, scope) ->
return _.some permissions, (permissionId) ->
permission = ChatPermissions.findOne permissionId
return _.some permission.roles, (roleName) ->
return permission and _.some permission.roles, (roleName) ->
role = RocketChat.models.Roles.findOne roleName
roleScope = role?.scope
return RocketChat.models[roleScope]?.isUserInRole?(Meteor.userId(), roleName, scope)

@ -8,7 +8,9 @@ Template.visitorNavigation.helpers({
pageVisited() {
const room = ChatRoom.findOne({ _id: this.rid }, { fields: { 'v.token': 1 } });
if (room && room.v && room.v.token) {
return LivechatPageVisited.find({ token: room.v.token }, { sort: { ts: -1 } });
}
},
pageTitle() {

@ -108,6 +108,9 @@ RocketChat.Livechat = {
if (s.trim(email) !== '' && (existingUser = RocketChat.models.Users.findOneGuestByEmailAddress(email))) {
if (loginToken) {
if (!updateUser.$addToSet) {
updateUser.$addToSet = {};
}
updateUser.$addToSet['services.resume.loginTokens'] = loginToken;
}

Loading…
Cancel
Save