[freeside-commits] freeside/httemplate/config config-view.cgi, 1.39.4.2, 1.39.4.3 config.cgi, 1.36, 1.36.4.1 config-process.cgi, 1.27, 1.27.4.1

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	config-view.cgi config.cgi config-process.cgi 
Log Message:
add default_agentnum config, RT#13302

Index: config-process.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-process.cgi,v
retrieving revision 1.27
retrieving revision 1.27.4.1
diff -u -w -d -r1.27 -r1.27.4.1
--- config-process.cgi	30 Jun 2010 20:42:54 -0000	1.27
+++ config-process.cgi	16 Jun 2011 20:21:47 -0000	1.27.4.1
@@ -65,7 +65,7 @@
 
 %     } elsif ( $type eq 'text' || $type eq 'select' ) {
         configCell.innerHTML = <% $conf->exists($i->key, $agentnum) ? $conf->config($i->key, $agentnum) : '' |js_string %>;
-%     } elsif ( $type =~ /^select-(part_svc|part_pkg|pkg_class)$/ && ! $i->multiple ) {
+%     } elsif ( $type =~ /^select-(part_svc|part_pkg|pkg_class|agent)$/ && ! $i->multiple ) {
 %       my $table = $1;
 %       my $namecol = $namecol{$table};
 %       my $pkey = dbdef->table($table)->primary_key;
@@ -95,6 +95,7 @@
   'part_svc'  => 'svc',
   'part_pkg'  => 'pkg',
   'pkg_class' => 'classname',
+  'agent'     => 'agent',
 );
 </%once>
 <%init>
@@ -158,7 +159,7 @@
     }
   } elsif (
     $type =~ /^(editlist|selectmultiple)$/
-    or ( $type =~ /^select(-(sub|part_svc|part_pkg|pkg_class))?$/
+    or ( $type =~ /^select(-(sub|part_svc|part_pkg|pkg_class|agent))?$/
          || $i->multiple )
   ) {
     if ( scalar(@{[ $cgi->param($i->key.$n) ]}) ) {
@@ -168,7 +169,7 @@
     } else {
       $conf->delete($i->key, $agentnum);
     }
-  } elsif ( $type =~ /^(text|select(-(sub|part_svc|part_pkg|pkg_class))?)$/ ) {
+  } elsif ( $type =~ /^(text|select(-(sub|part_svc|part_pkg|pkg_class|agent))?)$/ ) {
     if ( $cgi->param($i->key.$n) ne '' ) {
       my $error = &{$i->validate}($cgi->param($i->key.$n), $n) if $i->validate;
       push @error, $error if $error;

Index: config-view.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-view.cgi,v
retrieving revision 1.39.4.2
retrieving revision 1.39.4.3
diff -u -w -d -r1.39.4.2 -r1.39.4.3
--- config-view.cgi	18 Jan 2011 03:32:45 -0000	1.39.4.2
+++ config-view.cgi	16 Jun 2011 20:21:47 -0000	1.39.4.3
@@ -212,7 +212,7 @@
               </td>
             </tr>
 
-%   } elsif ( $type =~ /^select-(part_svc|part_pkg|pkg_class)$/ ) {
+%   } elsif ( $type =~ /^select-(part_svc|part_pkg|pkg_class|agent)$/ ) {
 %
 %     my $table = $1;
 %     my $namecol = $namecol{$table};
@@ -318,6 +318,7 @@
   'part_svc'  => 'svc',
   'part_pkg'  => 'pkg',
   'pkg_class' => 'classname',
+  'agent'     => 'agent',
 );
 </%once>
 <%init>

Index: config.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config.cgi,v
retrieving revision 1.36
retrieving revision 1.36.4.1
diff -u -w -d -r1.36 -r1.36.4.1
--- config.cgi	30 Jun 2010 20:42:53 -0000	1.36
+++ config.cgi	16 Jun 2011 20:21:47 -0000	1.36.4.1
@@ -323,7 +323,7 @@
 my %confitems = map { $_->key => $_ } @config_items;
 
 my %element_types = map { $_ => 1 } qw(
-  select-part_svc select-part_pkg select-pkg_class
+  select-part_svc select-part_pkg select-pkg_class select-agent
 );
 
 </%once>