diff --git a/src/migration/index.js b/src/migration/index.js index 09bd7ba5d..8f93439bd 100644 --- a/src/migration/index.js +++ b/src/migration/index.js @@ -16,7 +16,6 @@ var _ = require('lodash') var async = require('async') var winston = require('winston') var semver = require('semver') -var moment = require('moment-timezone') var SettingsSchema = require('../models/setting') var userSchema = require('../models/user') diff --git a/src/socketio/ticketSocket.js b/src/socketio/ticketSocket.js index dfd77bf0b..950f90a0c 100644 --- a/src/socketio/ticketSocket.js +++ b/src/socketio/ticketSocket.js @@ -94,7 +94,7 @@ events.onUpdateAssigneeList = function (socket) { socket.on('updateAssigneeList', function () { roleSchema.getAgentRoles(function (err, roles) { if (err) return true - userSchema.find({ role: { $in: roles } }, function (err, users) { + userSchema.find({ role: { $in: roles }, deleted: false }, function (err, users) { if (err) return true var sortedUser = _.sortBy(users, 'fullname')