lathama: branch 2.0 r5159 - in /branches/2.0/config/js: pbx2.js queues.js

[SVN commits to the Asterisk-GUI project]

Author: lathama
Date: Fri Feb 18 16:08:00 2011
New Revision: 5159

URL: http://svnview.digium.com/svn/asterisk-gui?view=rev&rev=5159
Log:
AddQueueMember support

Add Asterisk-gui support for AddQueueMember which was formerly
AgentLoginCallBack in Asterisk 1.4.

(closes issue #14459)
Reported by: timeshell
Patches: 
      queue2.diff uploaded by cjacobsen (license 1029)
Tested by: cjacobsen, timeshell, lathama


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

Modified: branches/2.0/config/js/pbx2.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/pbx2.js?view=diff&rev=5159&r1=5158&r2=5159
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Fri Feb 18 16:08:00 2011
@@ -704,7 +704,7 @@
 		'queue-member-manager' : [
 			'handle_member,1,Verbose(2, Looping through queues to log in or out queue members)',
 			'handle_member,n,Set(thisActiveMember=${CHANNEL(channeltype)}/${CHANNEL(peername)})',
-			'handle_member,n,Set(queue_field=1)',
+			'handle_member,n,Set(queue_field=2)',
 			'handle_member,n,Set(thisQueueXtn=${CUT(QUEUES,\\,,${queue_field})})',
 			'handle_member,n,While($[${EXISTS(${thisQueueXtn})}])',
 			'handle_member,n,Macro(member-loginlogout)',
@@ -716,7 +716,6 @@
 			's,1,Verbose(2, Logging queue member in or out of the request queue)',
 			's,n,Set(thisQueue=${thisQueueXtn})',
 			's,n,Set(queueMembers=${QUEUE_MEMBER_LIST(${thisQueue})})',
-			's,n,MacroIf("${queueMembers}" = ""]?q_login)',
 			's,n,Set(field=1)',
 			's,n,Set(logged_in=0)',
 			's,n,Set(thisQueueMember=${CUT(queueMembers,\\,,${field})})',
@@ -739,7 +738,7 @@
 			's,1,Verbose(2, Logged ${thisActiveMember} out of ${thisQueue} queue)',
 			's,n,RemoveQueueMember(${thisQueue},${thisActiveMember})',
 			's,n,Playback(silence/1)',
-			's,n,ExecIf($["${AQMSTATUS}" = "REMOVED"]?Playback(agent-loggedoff):Playback(an-error-has-occurred))'
+			's,n,ExecIf($["${RQMSTATUS}" = "REMOVED"]?Playback(agent-loggedoff):Playback(an-error-has-occurred))'
 		]
 	};
 	var sip_changes = {

Modified: branches/2.0/config/js/queues.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/queues.js?view=diff&rev=5159&r1=5158&r2=5159
==============================================================================
--- branches/2.0/config/js/queues.js (original)
+++ branches/2.0/config/js/queues.js Fri Feb 18 16:08:00 2011
@@ -79,7 +79,7 @@
 				_$('login_exten').value = ASTGUI.parseContextLine.getExten(m[l]['configLine']) ;
 				continue;
 			}
-			if( m[l]['configLine'].contains(',1,Goto(queue-member-manager, handle_member, 1)') ){
+			if( m[l]['configLine'].contains(',1,Goto(queue-member-manager,handle_member,1)') ){
 				loginsettings.agentCallbackLogin_line = m[l]['configLine'];
 				_$('login_callback_exten').value = ASTGUI.parseContextLine.getExten(m[l]['configLine']);
 				continue;
@@ -405,9 +405,9 @@
  		delete parent.sessionData.pbxinfo.queues[OLD_EXT] ;
 	}
 	if(lce){
-		u.new_action('append', ASTGUI.contexts.QUEUES , 'exten', lce + ',1,Goto(queue-member-manager, handle_member, 1)');
+		u.new_action('append', ASTGUI.contexts.QUEUES , 'exten', lce + ',1,Goto(queue-member-manager,handle_member,1)');
 		parent.sessionData.pbxinfo.queues[lce] = new ASTGUI.customObject;
-		parent.sessionData.pbxinfo.queues[lce]['configLine'] = lce + ',1,Goto(queue-member-manager, handle_member, 1)' ;
+		parent.sessionData.pbxinfo.queues[lce]['configLine'] = lce + ',1,Goto(queue-member-manager,handle_member,1)' ;
 	}
 
 	u.callActions();