rbrindley: branch 2.0 r4694 - /branches/2.0/config/js/
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Wed Apr 1 14:25:27 CDT 2009
Author: rbrindley
Date: Wed Apr 1 14:25:23 2009
New Revision: 4694
URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4694
Log:
- merged the latest and greatest from astman_revamp
- the GUI has now completely replaced astgui_manage* objects with the pbx object!!!
- time to celebrate!
Modified:
branches/2.0/config/js/menus.js
branches/2.0/config/js/paging.js
branches/2.0/config/js/queues.js
branches/2.0/config/js/vmgroups.js
Modified: branches/2.0/config/js/menus.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/menus.js?view=diff&rev=4694&r1=4693&r2=4694
==============================================================================
--- branches/2.0/config/js/menus.js (original)
+++ branches/2.0/config/js/menus.js Wed Apr 1 14:25:23 2009
@@ -492,7 +492,7 @@
var delete_voiceMenu_confirm = function(a){
if (!confirm('delete selected voicemenu ?')) { return; }
EDIT_VMENU = a ;
- parent.astgui_manageVoiceMenus.deleteMenu(EDIT_VMENU);
+ parent.pbx.voice_menus.remove(EDIT_VMENU);
window.location.reload();
};
@@ -548,10 +548,10 @@
}
if( isNewVmenu == true ){
- var vmenu_name = parent.astgui_manageVoiceMenus.nextAvailableVM_x();
+ var vmenu_name = parent.pbx.voice_menus.next();
}else{
var vmenu_name = EDIT_VMENU ;
- parent.astgui_manageVoiceMenus.deleteMenu( vmenu_name );
+ parent.pbx.voice_menus.remove( vmenu_name );
}
var after = function(){
@@ -561,7 +561,7 @@
vm.steps.push( 'NoOp(' + vm.comment + ')' );
vm.steps = vm.steps.concat( CURRENT_ACTIONS );
vm.alias_exten = ASTGUI.getFieldValue('vmenu_ext');
- parent.astgui_manageVoiceMenus.addMenu( vmenu_name, vm , after );
+ parent.pbx.voice_menus.add( vmenu_name, vm , after );
};
var show_createNewMenu_Form = function(){
@@ -761,10 +761,10 @@
})();
(function(){
- var t = ASTGUI.cloneObject( parent.astgui_managetrunks.listofAllTrunks() ) ;
+ var t = ASTGUI.cloneObject( parent.pbx.trunks.list() ) ;
var TMP_FORSORT = [];
t.each(function(item){
- TMP_FORSORT.push( parent.astgui_managetrunks.misc.getTrunkName(item) + ':::::::' + item);
+ TMP_FORSORT.push( parent.pbx.trunks.getName(item) + ':::::::' + item);
});
TMP_FORSORT.sort();
var trunks_selectbox = _$('newstep_dial_ViaTrunk');
@@ -780,7 +780,7 @@
ASTGUI.selectbox.append('newstep_mohClass', this_class, this_class );
});
- var c = parent.astgui_manageCallPlans.listPlans() ;
+ var c = parent.pbx.call_plans.list() ;
c.each(function(plan){
ASTGUI.selectbox.append('newstep_disaContext', plan.withOut( ASTGUI.contexts.CallingPlanPrefix ) , plan );
});
Modified: branches/2.0/config/js/paging.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/paging.js?view=diff&rev=4694&r1=4693&r2=4694
==============================================================================
--- branches/2.0/config/js/paging.js (original)
+++ branches/2.0/config/js/paging.js Wed Apr 1 14:25:23 2009
@@ -91,12 +91,12 @@
parent.ASTGUI.dialog.hide();
window.location.reload();
};
- parent.astgui_managePageGroups.addPageGroup( tmp_new_line, later );
+ parent.pbx.paging.add( tmp_new_line, later );
};
if( !isNewPgGrp ){ // if editing existing ring group
parent.ASTGUI.dialog.waitWhile(' Saving... ');
- parent.astgui_managePageGroups.deletePageGroup( PgGrp_EDITING, tmp_after );
+ parent.pbx.paging.remove( PgGrp_EDITING, tmp_after );
}else{
parent.ASTGUI.dialog.waitWhile(' Saving... ');
tmp_after();
@@ -178,7 +178,7 @@
var delete_pageGroup_confirm = function(d){
if (!confirm('Delete Page/Intercom Group ?')) { return; }
parent.ASTGUI.dialog.waitWhile(' Saving... ');
- parent.astgui_managePageGroups.deletePageGroup(d, function(){
+ parent.pbx.paging.remove(d, function(){
ASTGUI.feedback({ msg:'Page/Intercom Group deleted', showfor:2 });
parent.ASTGUI.dialog.hide();
window.location.reload();
@@ -282,7 +282,7 @@
})();
try{
(function (){
- var t = parent.astgui_manageusers.listOfUsers();
+ var t = parent.pbx.users.list();
t.each(function(usr){
if( parent.sessionData.pbxinfo['users'][usr]['hassip'] && parent.sessionData.pbxinfo['users'][usr]['hassip'] == 'yes' ){
listOfDialDevices.push( 'SIP/' + usr );
Modified: branches/2.0/config/js/queues.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/queues.js?view=diff&rev=4694&r1=4693&r2=4694
==============================================================================
--- branches/2.0/config/js/queues.js (original)
+++ branches/2.0/config/js/queues.js Wed Apr 1 14:25:23 2009
@@ -281,7 +281,7 @@
var load_agents_checkboxes = function(){
- var ul = parent.astgui_manageusers.listOfUsers();
+ var ul = parent.pbx.users.list();
var ul_agents = {};
var agent_count = 0 ;
ul.each(function(user){
Modified: branches/2.0/config/js/vmgroups.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/vmgroups.js?view=diff&rev=4694&r1=4693&r2=4694
==============================================================================
--- branches/2.0/config/js/vmgroups.js (original)
+++ branches/2.0/config/js/vmgroups.js Wed Apr 1 14:25:23 2009
@@ -27,7 +27,7 @@
var addCell = ASTGUI.domActions.tr_addCell;
(function(){ // load list of all voicemail boxes available on the system as checkboxes in 'edit_includeCheckboxes_div'
- var g = parent.astgui_manageusers.listOfUsers();
+ var g = parent.pbx.users.list();
var f = [];
g.each( function(this_user){
if( parent.sessionData.pbxinfo['users'][this_user].getProperty('hasvoicemail').isAstTrue() ){
@@ -136,7 +136,7 @@
save_VMGroup : function(){ // vmgroups_miscFunctions.save_VMGroup(exten)
if( isNEW_VMG == false ){ // delete the previous vmg
- parent.astgui_manageVMgroups.deleteVMGroup(EDIT_VMG);
+ parent.pbx.vm_groups.remove(EDIT_VMG);
}
if ( !ASTGUI.checkRequiredFields([ 'edit_vmgroup_exten' , 'edit_vmgroup_label' ]) ) return ;
@@ -161,7 +161,7 @@
a.label = ASTGUI.getFieldValue('edit_vmgroup_label');
a.mailboxes = ASTGUI.domActions.get_checked( vmg_chkbxClass );
- parent.astgui_manageVMgroups.addVMGroup( vm_exten , a );
+ parent.pbx.vm_groups.add(vm_exten, a);
ASTGUI.feedback( { msg: 'Changes Saved !', showfor: 2 , color: 'green', bgcolor: '#FFFFFF' } );
window.location.reload();
@@ -169,7 +169,7 @@
delete_VMG : function(vmgexten){ // vmgroups_miscFunctions.delete_VMG(exten)
if( !confirm('Delete VoiceMail Group ' + vmgexten + ' ?') ) return;
- parent.astgui_manageVMgroups.deleteVMGroup(vmgexten);
+ parent.pbx.vm_groups.remove(vmgexten);
setTimeout( function(){
ASTGUI.feedback({ msg: 'VoiceMail Group Deleted !', showfor: 3 , color: 'red', bgcolor: '#FFFFFF' });
window.location.reload();
More information about the asterisk-gui-commits
mailing list