[freeside-commits] freeside/FS/FS Conf.pm,1.397.2.54,1.397.2.55

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv2737/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Conf.pm 
Log Message:
add default_agentnum config, RT#13302

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.397.2.54
retrieving revision 1.397.2.55
diff -u -w -d -r1.397.2.54 -r1.397.2.55
--- Conf.pm	11 Jun 2011 02:42:50 -0000	1.397.2.54
+++ Conf.pm	16 Jun 2011 20:21:46 -0000	1.397.2.55
@@ -1821,22 +1821,17 @@
   },
 
   {
+    'key'         => 'default_agentnum',
+    'section'     => 'UI',
+    'description' => 'Default agent for the backoffice',
+    'type'        => 'select-agent',
+  },
+
+  {
     'key'         => 'signup_server-default_agentnum',
     'section'     => 'self-service',
     'description' => 'Default agent for the signup server',
-    'type'        => 'select-sub',
-    'options_sub' => sub { require FS::Record;
-                           require FS::agent;
-			   map { $_->agentnum => $_->agent }
-                               FS::Record::qsearch('agent', { disabled=>'' } );
-			 },
-    'option_sub'  => sub { require FS::Record;
-                           require FS::agent;
-			   my $agent = FS::Record::qsearchs(
-			     'agent', { 'agentnum'=>shift }
-			   );
-                           $agent ? $agent->agent : '';
-			 },
+    'type'        => 'select-agent',
   },
 
   {