pari: branch 2.0 r3857 - /branches/2.0/config/bulkadd.html

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Mon Sep 22 17:27:41 2008
New Revision: 3857

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

 * Check for duplicates in all extensions - not just users

 * While adding range of users, instead of throwing a 'duplicate alert' keep continuing until the number of extensions are added



Modified:
    branches/2.0/config/bulkadd.html

Modified: branches/2.0/config/bulkadd.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/bulkadd.html?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- branches/2.0/config/bulkadd.html (original)
+++ branches/2.0/config/bulkadd.html Mon Sep 22 17:27:41 2008
@@ -99,8 +99,8 @@
 		}
 
 		var this_user = this_user_details[0]; // User
-		if( parent.sessionData.pbxinfo.users.hasOwnProperty(this_user)  ){
-			alert('Error: User '+ this_user + '(line ' + (tli + 1) + ' in CSV text) already exists');
+		if( parent.miscFunctions.ifExtensionAlreadyExists(this_user) ){
+			alert('Error: Duplicate Extension \n\n '+ ' Extension ' + this_user + ' already exists \n' + ' Please change extension in line ' + (tli + 1) );
 			return;
 		}
 
@@ -125,9 +125,9 @@
 
 	while(t){
 		var tmp_nu = String(tmp_user);
-		if( parent.sessionData.pbxinfo.users.hasOwnProperty(tmp_nu)  ){
-			alert('Error: User '+ tmp_nu + ' already exists');
-			return;
+		if( parent.miscFunctions.ifExtensionAlreadyExists(tmp_nu) ){
+			tmp_user++ ;
+			continue;
 		}
 
 		newusers_list.push(tmp_nu);