bkruse: branch 2.0 r3998 - in /branches/2.0/config: js/tooltip.js queues.html
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Tue Oct 21 16:36:33 CDT 2008
Author: bkruse
Date: Tue Oct 21 16:36:32 2008
New Revision: 3998
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=3998
Log:
Fix calling queues problem, where a user would press
a number in the queue to dial someone, but would be
interpreted in the current context instead of in a
user defined context (eg [default] instead of [queues])
(Reported by dkerr)
(Patch by dkerr, with minor syntactical changes by me)
(closes issue #13694)
Modified:
branches/2.0/config/js/tooltip.js
branches/2.0/config/queues.html
Modified: branches/2.0/config/js/tooltip.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/tooltip.js?view=diff&rev=3998&r1=3997&r2=3998
==============================================================================
--- branches/2.0/config/js/tooltip.js (original)
+++ branches/2.0/config/js/tooltip.js Tue Oct 21 16:36:32 2008
@@ -143,6 +143,7 @@
tooltips['queues'] .en[14] = "<B>Agent Login Extension:</B> Extension to be dialed for the Agents to Login to the Specific Queue. <br> This is an extension that all the Agents can Call to Login to their specified Queues. ";
tooltips['queues'] .en[15] = "<B>Agent Callback Login Extension:</B> Extension to be dialed for the Agents to Login to the Queues they are apart of.<br> Same as Agent Login Extension, except you do not have to remain on the line. ";
tooltips['queues'] .en[16] = "<B>Agent Logout</B>";
+ tooltips['queues'] .en[17] = "<B>KeyPress Events:</B> If a caller presses a key while waiting in the queue, this setting selects which voice menu should process the key press.";
// Tooltips for SIP_General (sip_general)
tooltips['sip_general']= new Object;
Modified: branches/2.0/config/queues.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/queues.html?view=diff&rev=3998&r1=3997&r2=3998
==============================================================================
--- branches/2.0/config/queues.html (original)
+++ branches/2.0/config/queues.html Tue Oct 21 16:36:32 2008
@@ -84,6 +84,7 @@
DOM_edit_joinempty = _$('edit_joinempty'); // chkbox
DOM_edit_leavewhenempty = _$('edit_leavewhenempty'); // chkbox
DOM_edit_reportholdtime = _$('edit_reportholdtime'); // chkbox
+ DOM_edit_voicemenuclass = _$('edit_voicemenuclass'); // select
};
@@ -169,7 +170,7 @@
var show_Queue_Form = function(){
if(isNewQueue == true){
- ASTGUI.resetTheseFields([ DOM_Queue_Ext, DOM_edit_label ,DOM_edit_strategy , DOM_edit_musicclass , DOM_edit_timeout , DOM_edit_wrapuptime , DOM_edit_maxlen , DOM_edit_autofill , DOM_edit_autopause , DOM_edit_joinempty , DOM_edit_leavewhenempty , DOM_edit_reportholdtime ]); // reset all fields
+ ASTGUI.resetTheseFields([ DOM_Queue_Ext, DOM_edit_label ,DOM_edit_strategy , DOM_edit_musicclass , DOM_edit_timeout , DOM_edit_wrapuptime , DOM_edit_maxlen , DOM_edit_autofill , DOM_edit_autopause , DOM_edit_joinempty , DOM_edit_leavewhenempty , DOM_edit_reportholdtime, DOM_edit_voicemenuclass ]); /* reset all fields */
ASTGUI.domActions.unCheckAll( ag_chkbxClass );
DOM_Queue_Ext.disabled = false;
var tmp_ql = parent.sessionData.pbxinfo.queues.getOwnProperties();
@@ -178,6 +179,7 @@
$(DOM_edit_QueueDiv).showWithBg();
ASTGUI.feedback({ msg:'Create New Queue!', showfor:2 });
ASTGUI.updateFieldToValue(DOM_edit_musicclass, 'default' );
+ ASTGUI.updateFieldToValue(DOM_edit_voicemenuclass, '' );
return;
}
@@ -196,6 +198,7 @@
ASTGUI.updateFieldToValue(DOM_edit_joinempty, QUEUES_CONF[EDIT_Queue].getProperty('joinempty') );
ASTGUI.updateFieldToValue(DOM_edit_leavewhenempty, QUEUES_CONF[EDIT_Queue].getProperty('leavewhenempty') );
ASTGUI.updateFieldToValue(DOM_edit_reportholdtime, QUEUES_CONF[EDIT_Queue].getProperty('reportholdtime') );
+ ASTGUI.updateFieldToValue(DOM_edit_voicemenuclass, QUEUES_CONF[EDIT_Queue].getProperty('context') );
ASTGUI.domActions.checkSelected( ag_chkbxClass, (QUEUES_CONF[EDIT_Queue].getProperty('member')) ? QUEUES_CONF[EDIT_Queue]['member'].split(',') :[] ) ;
ASTGUI.feedback({ msg:'Edit Queue !', showfor:2 });
@@ -250,6 +253,8 @@
x.new_action('append', cat, 'reportholdtime', ASTGUI.getFieldValue(DOM_edit_reportholdtime));
x.new_action('append', cat, 'maxlen', ASTGUI.getFieldValue(DOM_edit_maxlen));
x.new_action('append', cat, 'musicclass', ASTGUI.getFieldValue(DOM_edit_musicclass));
+ var s = ASTGUI.getFieldValue(DOM_edit_voicemenuclass);
+ if (s != '') x.new_action('append', cat, 'context', s);
}else{
if( parent.sessionData.pbxinfo.queues[cat].hasOwnProperty('isOLDGUI') && parent.sessionData.pbxinfo.queues[cat].isOLDGUI == true ){
@@ -272,6 +277,9 @@
x.new_action('update', cat, 'reportholdtime', ASTGUI.getFieldValue(DOM_edit_reportholdtime));
x.new_action('update', cat, 'maxlen', ASTGUI.getFieldValue(DOM_edit_maxlen));
x.new_action('update', cat, 'musicclass', ASTGUI.getFieldValue(DOM_edit_musicclass));
+ var s = ASTGUI.getFieldValue(DOM_edit_voicemenuclass);
+ if (s != '') x.new_action('update', cat, 'context', s);
+ else x.new_action('delete', cat, 'context');
}
var ags = ASTGUI.domActions.get_checked(ag_chkbxClass) ;
@@ -340,7 +348,14 @@
ASTGUI.selectbox.append('edit_musicclass', this_class, this_class );
});
_$('edit_musicclass').selectedIndex = -1 ;
-
+/* Need to add list of voicemenus */
+ ASTGUI.selectbox.append('edit_voicemenuclass', 'None', '' );
+ var vmcls = parent.sessionData.pbxinfo.voicemenus.getOwnProperties();
+ vmcls.each(function(vmenu){
+ var vm_name = parent.sessionData.pbxinfo.voicemenus[vmenu].comment || vmenu ;
+ ASTGUI.selectbox.append('edit_voicemenuclass', 'VoiceMenu -- ' + vm_name, vmenu );
+ });
+/* end */
} )();
loadDOMElements();
@@ -543,6 +558,11 @@
</td>
<td><label for='edit_reportholdtime'>Report Hold Time</label></td>
</tr>
+ <tr> <td colspan=2 align=right>KeyPress Events :</td>
+ <td colspan=2><select id="edit_voicemenuclass"></select>
+ <img src="images/tooltip_info.gif" tip="en,queues,17" class='tooltipinfo'>
+ </td>
+ </tr>
</table>
</fieldset>
</td>
More information about the asterisk-gui-commits
mailing list