pari: trunk r335 - in /trunk/config: scripts/astman.js users.html

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Tue Feb 13 17:46:50 2007
New Revision: 335

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=335
Log:
bug Fix: Create exception for zapscan.conf - for cases where zapscan not found on the target system or installed in some other folder. As mentioned in http://bugs.digium.com/view.php?id=9047 

Modified:
    trunk/config/scripts/astman.js
    trunk/config/users.html

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?view=diff&rev=335&r1=334&r2=335
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Tue Feb 13 17:46:50 2007
@@ -1546,7 +1546,9 @@
 	};
 	this.doConfig = function(t, box) {
 		if(t[0].headers['message']){
-			if( t[0].headers['message'] == "Config file not found"){
+			if( box.config_file == "zapscan.conf" ){
+				alert( "Note: Unable to find /etc/asterisk/zapscan.conf\nPlease run Zapscan manually ! \n\n Click 'OK' to try loading the rest of the page." );
+			} else if( t[0].headers['message'] == "Config file not found" && box.config_file != "zapscan.conf"){
 				alert( "Asterisk says it cannot find a required config file (" + box.config_file + ") \n You will be now redirected to the main page !" );
 				parent.window.location.href = parent.window.location.href ;
 				return ;

Modified: trunk/config/users.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/users.html?view=diff&rev=335&r1=334&r2=335
==============================================================================
--- trunk/config/users.html (original)
+++ trunk/config/users.html Tue Feb 13 17:46:50 2007
@@ -341,7 +341,7 @@
 												<tr onmouseover="show_tooltip('en', 'users', 3);"><td class="field_text">E-mail:</td><td><input size='20' id='email' pattern='^[0-9a-zA-Z\.\-\_\@]*$' class="input8"></td></tr>
 												<tr onmouseover="show_tooltip('en', 'users', 4);"><td class="field_text">Caller ID:</td><td><input size='12' id='cid_number'  pattern='^[\d\-]*$' class="input8"></td></tr>
 												<tr onmouseover="show_tooltip('en', 'users', 5);"><td class="field_text">Analog Phone:</td><td><select size="1" id='zapchan' style='width:120px' class="input8"></select>
-												<span id="noanaloglines" style="display:none"><I>&nbsp;No Analog lines installed.</I></span></td></tr>
+												<span id="noanaloglines" style="display:none"><I>&nbsp;No Analog lines detected.</I></span></td></tr>
 												<tr onmouseover="show_tooltip('en', 'users', 6);"><td class="field_text">Dial Plan:</td><td><select size='1' id='context' style='width:120px' class="input8"></select></td></tr>
 												<tr><td colspan='2' align='center'><div style="height:15px" id='status'></div></td></tr>
 												<tr><td colspan='2' align='center'><input type='hidden' id='mailbox'><input type='hidden' id='group'></td></tr>