[freeside-commits] freeside/FS/FS part_svc_column.pm, 1.4, 1.5 part_svc.pm, 1.28, 1.29

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv10626/FS/FS

Modified Files:
	part_svc_column.pm part_svc.pm 
Log Message:
limited domain select

Index: part_svc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_svc.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- part_svc.pm	12 Jul 2006 00:20:21 -0000	1.28
+++ part_svc.pm	25 Oct 2006 02:22:33 -0000	1.29
@@ -544,6 +544,12 @@
                       $param->{ $svcdb.'__'.$_ } =
                         delete( $param->{ $svcdb.'__'.$_.'_classnum' } );
                     }
+		    if ( $param->{ $svcdb.'__'.$_.'_flag' } =~ /^S$/ ) {
+                      $param->{ $svcdb.'__'.$_} =
+                        ref($param->{ $svcdb.'__'.$_})
+                          ? join(',', @{$param->{ $svcdb.'__'.$_ }} )
+                          : $param->{ $svcdb.'__'.$_ };
+		    }
                     ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' );
                   }
                   @fields;

Index: part_svc_column.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_svc_column.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- part_svc_column.pm	24 Jun 2006 16:41:44 -0000	1.4
+++ part_svc_column.pm	25 Oct 2006 02:22:33 -0000	1.5
@@ -41,7 +41,7 @@
 
 =item columnvalue - default or fixed value for the column
 
-=item columnflag - null or empty (no default), `D' for default, `F' for fixed (unchangeable), `M' for manual selection from inventory, or `A' for automatic selection from inventory.  For virtual fields, can also be 'X' for excluded.
+=item columnflag - null or empty (no default), `D' for default, `F' for fixed (unchangeable), `S' for selectable choice, `M' for manual selection from inventory, or `A' for automatic selection from inventory.  For virtual fields, can also be 'X' for excluded.
 
 =back
 
@@ -91,7 +91,7 @@
   ;
   return $error if $error;
 
-  $self->columnflag =~ /^([DFMAX])$/
+  $self->columnflag =~ /^([DFSMAX])$/
     or return "illegal columnflag ". $self->columnflag;
   $self->columnflag(uc($1));