rbrindley: branch rbrindley/astman_revamp r4590 - in /team/rbrindley/astman_r...

Fri Mar 6 08:14:15 CST 2009

Author: rbrindley
Date: Fri Mar  6 08:14:11 2009
New Revision: 4590

URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4590
Log:

- included pbx2.js into index.html
- fixed a typo in pbx2.js
- users.js now uses pbx.users.add


Modified:
    team/rbrindley/astman_revamp/config/index.html
    team/rbrindley/astman_revamp/config/js/pbx2.js
    team/rbrindley/astman_revamp/config/js/users.js

Modified: team/rbrindley/astman_revamp/config/index.html
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/index.html?view=diff&rev=4590&r1=4589&r2=4590
==============================================================================

--- team/rbrindley/astman_revamp/config/index.html (original)
+++ team/rbrindley/astman_revamp/config/index.html Fri Mar  6 08:14:11 2009
@@ -92,6 +92,7 @@
 <script src="js/tooltip.js"></script>
 <script src="js/astman.js"></script>
 <script src="js/pbx.js"></script>
+<script src="js/pbx2.js"></script>
 <script src="js/index.js"></script>
 <head>
 	<title>Asterisk Configuration GUI</title>

Modified: team/rbrindley/astman_revamp/config/js/pbx2.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/pbx2.js?view=diff&rev=4590&r1=4589&r2=4590
==============================================================================
--- team/rbrindley/astman_revamp/config/js/pbx2.js (original)
+++ team/rbrindley/astman_revamp/config/js/pbx2.js Fri Mar  6 08:14:11 2009
@@ -106,11 +106,11 @@
  * @param callback The callback function once the user has been added.
  */
 pbx.users.add = function(exten, info, callback) {
-	userinfo = ASTGUI.toCustomObject(userinfo);
+	info = ASTGUI.toCustomObject(info);
 
 	var disallow = info.getProperty('disallow') || 'all';
 	var allow = info.getProperty('allow') || 'all';
-	sessionData.pbxinfo['users'][exten] = userinfo;
+	sessionData.pbxinfo['users'][exten] = info;
 	sessionData.pbxinfo['users'][exten]['disallow'] = disallow;
 	sessionData.pbxinfo['users'][exten]['allow'] = allow;
 	sessionData.pbxinfo['users'][exten]['mailbox'] = info.mailbox || exten;
@@ -227,7 +227,7 @@
 		} else {
 			params.callback();
 		}
-	}):
+	});
 };
 /*---------------------------------------------------------------------------*/
 

Modified: team/rbrindley/astman_revamp/config/js/users.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/users.js?view=diff&rev=4590&r1=4589&r2=4590
==============================================================================
--- team/rbrindley/astman_revamp/config/js/users.js (original)
+++ team/rbrindley/astman_revamp/config/js/users.js Fri Mar  6 08:14:11 2009
@@ -462,7 +462,7 @@
 				};
 				var newuser_settings = ASTGUI.toCustomObject( { fullname : ASTGUI.getFieldValue('edit_fullname'), registersip: 'no', host: 'dynamic', callgroup : '1' } );
 				parent.ASTGUI.dialog.waitWhile(' Saving... ');
-				parent.astgui_manageusers.addUser( NU_EXT, newuser_settings , cb );
+				top.pbx.users.add( NU_EXT, newuser_settings, cb);
 				return;
 		}else{
 			///////////////////


