Browse Source

UI-1499: Updated every timezone dropdown to allow selecting Account/User default

4.3
Maxime Roux 11 years ago
parent
commit
8de42d400f
2 changed files with 9 additions and 5 deletions
  1. +3
    -3
      submodules/users/users.js
  2. +6
    -2
      submodules/vmboxes/vmboxes.js

+ 3
- 3
submodules/users/users.js View File

@ -424,7 +424,7 @@ define(function(require){
if(type === 'name') {
currentUser = data;
template.find('#user_timezone').chosen({search_contains: true, width: "61%"});
template.find('#user_timezone').chosen({search_contains: true, width: "220px"});
data.extra.differentEmail ? template.find('.email-group').show() : template.find('.email-group').hide();
@ -2473,7 +2473,7 @@ define(function(require){
}
});
timezone.populateDropdown(template.find('#user_timezone'), dataTemplate.timezone);
timezone.populateDropdown(template.find('#user_timezone'), dataTemplate.timezone||'inherit', {inherit: self.i18n.active().defaultTimezone});
monster.ui.tooltips(template, {
options: {
@ -2705,7 +2705,7 @@ define(function(require){
var self = this,
fullName = data.user.first_name + ' ' + data.user.last_name,
callerIdName = fullName.substring(0, 15),
defaultTimezone = timezone.getLocaleTimezone(),
defaultTimezone = 'inherit',
formattedData = {
user: $.extend(true, {}, {
caller_id: {


+ 6
- 2
submodules/vmboxes/vmboxes.js View File

@ -155,8 +155,8 @@ define(function(require){
monster.ui.tabs(templateVMBox);
timezone.populateDropdown(templateVMBox.find('#timezone'), data.timezone);
templateVMBox.find('#timezone').chosen({search_contains: true, width: "40%"});
timezone.populateDropdown(templateVMBox.find('#timezone'), data.timezone||'inherit', {inherit: self.i18n.active().defaultTimezone});
templateVMBox.find('#timezone').chosen({search_contains: true, width: "220px"});
monster.ui.tooltips(templateVMBox);
@ -255,6 +255,10 @@ define(function(require){
delete mergedData.notify_email_address;
}
if(mergedData.timezone && mergedData.timezone === 'inherit') {
delete mergedData.timezone;
}
delete mergedData.extra;
return mergedData;


Loading…
Cancel
Save