Browse Source

UI-580: Changed some logic in SmartPBX to get rid of an unnecessary API

call to /vmboxes
4.3
Jean-Roch Maitre 12 years ago
parent
commit
81f70a9eb9
1 changed files with 22 additions and 17 deletions
  1. +22
    -17
      submodules/users/users.js

+ 22
- 17
submodules/users/users.js View File

@ -2408,27 +2408,32 @@ define(function(require){
callback(null, userData);
});
},
vmbox: function(callback) {
self.usersListVMBoxesUser(userId, function(vmboxes) {
if(vmboxes.length > 0) {
self.usersGetVMBox(vmboxes[0].id, function(vmbox) {
callback(null, vmbox);
});
}
else {
callback(null, {});
}
});
},
existingVmboxes: function(callback) {
vmboxes: function(callback) {
self.usersListVMBoxes(function(vmboxes) {
var listVMBoxes = [];
var firstVmboxId,
results = {
listExisting: [],
userVM: {}
};
_.each(vmboxes, function(vmbox) {
listVMBoxes.push(vmbox.mailbox);
results.listExisting.push(vmbox.mailbox);
if(vmbox.owner_id === userId && !firstVmboxId) {
firstVmboxId = vmbox.id;
}
});
callback(null, listVMBoxes);
if(firstVmboxId) {
self.usersGetVMBox(firstVmboxId, function(vmbox) {
results.userVM = vmbox;
callback(null, results);
});
}
else {
callback(null, results);
}
});
}
},
@ -2443,7 +2448,7 @@ define(function(require){
}
});
var dataTemplate = self.usersFormatUserData(userData, results.mainDirectory, results.mainCallflow, results.vmbox, results.existingVmboxes);
var dataTemplate = self.usersFormatUserData(userData, results.mainDirectory, results.mainCallflow, results.vmboxes.userVM, results.vmboxes.listExisting);
template = $(monster.template(self, 'users-name', dataTemplate));


Loading…
Cancel
Save