diff options
| author | jeff <jeff> | 2006-10-25 02:22:33 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2006-10-25 02:22:33 +0000 |
| commit | c84d872fdca241d798cc988b44c63d5ac0ea8ead (patch) | |
| tree | 64d81be3eb8c843e134501da355af4fec612d798 /FS | |
| parent | df4a30e2813c3be288747cd2a5fa2fa3ed15a248 (diff) | |
limited domain select
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/part_svc.pm | 6 | ||||
| -rw-r--r-- | FS/FS/part_svc_column.pm | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm index 258734735..fc5258fff 100644 --- a/FS/FS/part_svc.pm +++ b/FS/FS/part_svc.pm @@ -544,6 +544,12 @@ sub process { $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; diff --git a/FS/FS/part_svc_column.pm b/FS/FS/part_svc_column.pm index fb08eaa0d..d2b8fd91b 100644 --- a/FS/FS/part_svc_column.pm +++ b/FS/FS/part_svc_column.pm @@ -41,7 +41,7 @@ fields are currently supported: =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 @@ sub check { ; return $error if $error; - $self->columnflag =~ /^([DFMAX])$/ + $self->columnflag =~ /^([DFSMAX])$/ or return "illegal columnflag ". $self->columnflag; $self->columnflag(uc($1)); |