Browse Source

UI-49: Fixed behavior of 'leave voicemail' checkbox in call forward feature

4.3
Maxime Roux 12 years ago
parent
commit
88923a6bbc
4 changed files with 50 additions and 10 deletions
  1. +2
    -1
      i18n/en-US.json
  2. +2
    -1
      i18n/fr-FR.json
  3. +34
    -7
      submodules/users/users.js
  4. +12
    -1
      views/users-feature-call_forward.html

+ 2
- 1
i18n/en-US.json View File

@ -385,7 +385,8 @@
"number": "This number",
"placeholder": "+14157283992",
"requireKeyPress": "Leave voicemails on forwarded numbers",
"title": "Call Forwarding"
"title": "Call Forwarding",
"timeoutWarning": "In order to leave voicemails on forwarded numbers, your ringing timeout needs to be set to at least 30sec. By saving now, you will automatically be redirected to the user edition where you can update the ringing timeout."
},
"callRecording": {
"title": "Inbound Call Recording",


+ 2
- 1
i18n/fr-FR.json View File

@ -363,7 +363,8 @@
"number": "Ce numéro",
"placeholder": "+14157283992",
"requireKeyPress": "Laisser message sur le répondeur du numéro transferé",
"title": "Transfert d'appels"
"title": "Transfert d'appels",
"timeoutWarning": "Afin de pouvoir laisser un message sur le répondeur du numéro transferé, la durée de sonnerie de l'utilisateur doit être d'au moins 30sec. En cliquant sur le bouton \"Sauvegarder\", vous serez automatiquement redirigé vers l'édition d'utilisateur où vous pourrez modifier la durée de sonnerie."
},
"callRecording": {
"title": "Enregistrement d'appel entrant",


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

@ -302,8 +302,6 @@ define(function(require){
dataUser.extra = formattedUser;
}
// console.log(_mainCallflow)
dataUser.extra.countFeatures = 0;
_.each(dataUser.features, function(v) {
if(v in dataUser.extra.mapFeatures) {
@ -1101,7 +1099,23 @@ define(function(require){
});
template.on('click', '.feature[data-feature="call_forward"]', function() {
self.usersRenderCallForward(currentUser);
if(currentUser.features.indexOf('find_me_follow_me') < 0) {
var featureUser = $.extend(true, {}, currentUser);
self.usersGetMainCallflow(featureUser.id, function(mainCallflow) {
if(mainCallflow && 'flow' in mainCallflow) {
var flow = mainCallflow.flow;
while(flow.module != 'user' && '_' in flow.children) {
flow = flow.children['_'];
}
if(flow.data.timeout < 30) {
featureUser.extra.timeoutTooShort = true;
}
}
self.usersRenderCallForward(featureUser);
});
} else {
self.usersRenderCallForward(currentUser);
}
});
template.on('click', '.feature[data-feature="hotdesk"]', function() {
@ -1724,12 +1738,22 @@ define(function(require){
featureForm = featureTemplate.find('#call_forward_form'),
args = {
callback: function() {
popup.dialog('close').remove()
popup.dialog('close').remove();
},
openedTab: 'features'
};
},
timeoutWarningBox = featureTemplate.find('.timeout-warning');
if(currentUser.call_forward.require_keypress) {
timeoutWarningBox.hide();
}
monster.ui.validate(featureForm);
monster.ui.prettyCheck.create(featureTemplate.find('.content'));
featureTemplate.find('input[name="require_keypress"]').on('ifToggled', function() {
timeoutWarningBox.toggle();
});
featureTemplate.find('.cancel-link').on('click', function() {
popup.dialog('close').remove();
@ -1750,6 +1774,7 @@ define(function(require){
featureTemplate.find('.save').on('click', function() {
if(monster.ui.valid(featureForm)) {
var formData = form2object('call_forward_form');
formData.require_keypress = !formData.require_keypress;
formData.enabled = switchFeature.bootstrapSwitch('status');
formData.number = monster.util.unformatPhoneNumber(formData.number, 'keepPlus');
@ -1757,6 +1782,10 @@ define(function(require){
var userToSave = $.extend(true, {}, currentUser, { call_forward: formData});
if(timeoutWarningBox.is(':visible')) {
args.openedTab = 'name';
}
self.usersUpdateUser(userToSave, function(data) {
args.userId = data.data.id;
@ -1765,8 +1794,6 @@ define(function(require){
}
});
monster.ui.prettyCheck.create(featureTemplate.find('.content'));
if ( currentUser.call_forward.number && /^(\+1)/.test(currentUser.call_forward.number) ) {
featureTemplate.find('#phoneType').val('mobile');
featureTemplate.find('#number').mask('+1 (999) 999-9999');


+ 12
- 1
views/users-feature-call_forward.html View File

@ -34,7 +34,7 @@
</div> -->
<label class="fix-left">
<input type="checkbox" name="require_keypress"{{#if call_forward.require_keypress}} checked{{/if}}></input>
<input type="checkbox" name="require_keypress"{{#unless call_forward.require_keypress}} checked{{/unless}}></input>
{{ i18n.users.call_forward.requireKeyPress }}
</label>
<label class="fix-left">
@ -47,6 +47,17 @@
</label>
</form>
{{#if extra.timeoutTooShort}}
<div class="help-box red-box timeout-warning">
<div class="wrapper-icon">
&nbsp;<i class="icon-warning-sign2"></i>&nbsp;
</div>
<div class="text-wrapper">
<p>{{ i18n.users.call_forward.timeoutWarning }}</p>
</div>
</div>
{{/if}}
<!--<div class="help-box gray-box">
<div class="wrapper-icon">
&nbsp;<i class="icon-info-sign2"></i>&nbsp;


Loading…
Cancel
Save