rbrindley: branch 2.0 r4780 - /branches/2.0/config/js/

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Thu May  7 09:20:32 2009
New Revision: 4780

URL: http://svn.asterisk.org/svn-view/asterisk-gui?view=rev&rev=4780
Log:

- fixed an issue where outgoing calling rules weren't deleted when edited in the same session as they were created
- when adding a user, if return false if info doesn't exist


Modified:
    branches/2.0/config/js/callingrules.js
    branches/2.0/config/js/pbx2.js

Modified: branches/2.0/config/js/callingrules.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/callingrules.js?view=diff&rev=4780&r1=4779&r2=4780
==============================================================================
--- branches/2.0/config/js/callingrules.js (original)
+++ branches/2.0/config/js/callingrules.js Thu May  7 09:20:32 2009
@@ -351,7 +351,7 @@
 		window.location.reload();
 	}else{
 		parent.ASTGUI.dialog.waitWhile(' Updating ...');
- 		parent.pbx.calling_rules.edit( EDIT_CR, EDIT_CR_RULE, as )
+ 		parent.pbx.calling_rules.edit( EDIT_CR, EDIT_CR_RULE, 'exten='+as )
 		ASTGUI.feedback( { msg:'Calling Rule Updated !', showfor:2, color:'green' });
 		parent.ASTGUI.dialog.hide();
 		window.location.reload();

Modified: branches/2.0/config/js/pbx2.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/pbx2.js?view=diff&rev=4780&r1=4779&r2=4780
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Thu May  7 09:20:32 2009
@@ -153,6 +153,7 @@
 		sessionData.pbxinfo.callingRules[name] = ASTGUI.cloneObject(sessionData.pbxinfo.callingRules[name]).withOut('exten=' + dp);
 	} else {
 		top.log.warn('pbx.calling_rules.remove: ' + name + ' exists, but does not contain ' + dp + '.');
+		return false;
 	}
 
 	return true;
@@ -1821,6 +1822,10 @@
  * @param callback The callback function once the user has been added.
  */
 pbx.users.add = function(exten, info, callback) {
+	if (!info) {
+		top.log.error('pbx.users.add: info was undefined.');
+		return false;
+	}
 	info = ASTGUI.toCustomObject(info);
 
 	var disallow = info.getProperty('disallow') || 'all';