Browse Source

UI-1808: The timezone field is now removed from the account document when selecting 'account default', instead of setting the timezone to 'inherit'.

4.3
Maxime Roux 10 years ago
parent
commit
7c27a8f12c
1 changed files with 10 additions and 7 deletions
  1. +10
    -7
      submodules/users/users.js

+ 10
- 7
submodules/users/users.js View File

@ -2385,6 +2385,10 @@ define(function(require){
userData.caller_id.internal.number = userData.presence_id + '';
}
if(userData.timezone === 'inherit') {
delete userData.timezone;
}
delete userData.include_directory;
delete userData.features;
delete userData.extra;
@ -2742,7 +2746,6 @@ define(function(require){
var self = this,
fullName = data.user.first_name + ' ' + data.user.last_name,
callerIdName = fullName.substring(0, 15),
defaultTimezone = 'inherit',
formattedData = {
user: $.extend(true, {}, {
caller_id: {
@ -2756,13 +2759,11 @@ define(function(require){
},
presence_id: data.callflow.extension,
email: data.extra.differentEmail ? data.extra.email : data.user.username,
priv_level: 'user',
timezone: defaultTimezone
priv_level: 'user'
}, data.user),
vmbox: {
mailbox: data.callflow.extension,
name: fullName + '\'s VMBox',
timezone: defaultTimezone
name: fullName + '\'s VMBox'
},
callflow: {
contact_list: {
@ -3359,6 +3360,9 @@ define(function(require){
usersUpdateVMBox: function(vmData, callback) {
var self = this;
// VMboxes should not specify any timezone in order to use the user's default.
delete vmData.timezone;
self.callApi({
resource: 'voicemail.update',
data: {
@ -3864,8 +3868,7 @@ define(function(require){
var vmbox = {
owner_id: user.id,
mailbox: user.presence_id || user.extra.vmbox.mailbox,
name: user.first_name + ' ' + user.last_name + '\'s VMBox',
timezone: user.timezone
name: user.first_name + ' ' + user.last_name + '\'s VMBox'
};
self.usersCreateVMBox(vmbox, function(vmbox) {


Loading…
Cancel
Save