projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
random nits for grandstream provisioning :UI, docs, java path, s/system/IPC::Run...
[freeside.git]
/
FS
/
FS
/
svc_acct_pop.pm
diff --git
a/FS/FS/svc_acct_pop.pm
b/FS/FS/svc_acct_pop.pm
index
3b8e978
..
de41f5b
100644
(file)
--- a/
FS/FS/svc_acct_pop.pm
+++ b/
FS/FS/svc_acct_pop.pm
@@
-93,6
+93,7
@@
sub check {
or $self->ut_number('ac')
or $self->ut_number('exch')
or $self->ut_numbern('loc')
or $self->ut_number('ac')
or $self->ut_number('exch')
or $self->ut_numbern('loc')
+ or $self->SUPER::check
;
}
;
}
@@
-107,7
+108,8
@@
Returns:
sub text {
my $self = shift;
sub text {
my $self = shift;
- $self->city. ', '. $self->state. ' ('. $self->ac. ')/'. $self->exch;
+ $self->city. ', '. $self->state.
+ ' ('. $self->ac. ')/'. $self->exch. '-'. $self->loc;
}
=back
}
=back
@@
-120,6
+122,8
@@
sub text {
=cut
=cut
+#horrible false laziness with signup.cgi (pull special-case for 0 & 1
+# pop code out from signup.cgi??)
sub popselector {
my( $popnum, $state ) = @_;
sub popselector {
my( $popnum, $state ) = @_;
@@
-129,7
+133,6
@@
sub popselector {
push @{$svc_acct_pop{$_->state}}, $_ foreach @svc_acct_pop;
}
push @{$svc_acct_pop{$_->state}}, $_ foreach @svc_acct_pop;
}
- my $size = 0;
my $text = <<END;
<SCRIPT>
function opt(what,href,text) {
my $text = <<END;
<SCRIPT>
function opt(what,href,text) {
@@
-140,8
+143,7
@@
sub popselector {
function popstate_changed(what) {
state = what.options[what.selectedIndex].text;
function popstate_changed(what) {
state = what.options[what.selectedIndex].text;
- for (var i = what.form.popnum.length;i > 0;i--)
- what.form.popnum.options[i] = null;
+ what.form.popnum.options.length = 0
what.form.popnum.options[0] = new Option("", "", false, true);
END
what.form.popnum.options[0] = new Option("", "", false, true);
END
@@
-151,7
+153,6
@@
END
foreach my $pop ( @{$svc_acct_pop{$popstate}}) {
my $o_popnum = $pop->popnum;
my $poptext = $pop->text;
foreach my $pop ( @{$svc_acct_pop{$popstate}}) {
my $o_popnum = $pop->popnum;
my $poptext = $pop->text;
- $size = length($poptext) if length($poptext) > $size;
$text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
}
$text .= "}\n";
$text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
}
$text .= "}\n";
@@
-166,27
+167,33
@@
END
$text .= '</SELECT>'; #callback? return 3 html pieces? #'</TD><TD>';
$text .= qq!<SELECT NAME="popnum" SIZE=1><OPTION> !;
$text .= '</SELECT>'; #callback? return 3 html pieces? #'</TD><TD>';
$text .= qq!<SELECT NAME="popnum" SIZE=1><OPTION> !;
- foreach my $pop ( @svc_acct_pop ) {
+ my @initial_select;
+ if ( scalar(@svc_acct_pop) > 100 ) {
+ @initial_select = qsearchs( 'svc_acct_pop', { 'popnum' => $popnum } );
+ } else {
+ @initial_select = @svc_acct_pop;
+ }
+ foreach my $pop ( @initial_select ) {
$text .= qq!<OPTION VALUE="!. $pop->popnum. '"'.
( ( $popnum && $pop->popnum == $popnum ) ? ' SELECTED' : '' ). ">".
$pop->text;
}
$text .= '</SELECT>';
$text .= qq!<OPTION VALUE="!. $pop->popnum. '"'.
( ( $popnum && $pop->popnum == $popnum ) ? ' SELECTED' : '' ). ">".
$pop->text;
}
$text .= '</SELECT>';
+ $text;
+
}
=back
}
=back
-=head1 VERSION
-
-$Id: svc_acct_pop.pm,v 1.4 2001-09-27 20:41:37 ivan Exp $
-
=head1 BUGS
It should be renamed to part_pop.
popselector? putting web ui components in here? they should probably live
=head1 BUGS
It should be renamed to part_pop.
popselector? putting web ui components in here? they should probably live
-somewhere else...
+somewhere else...
+
+popselector: pull special-case for 0 & 1 pop code out from signup.cgi
=head1 SEE ALSO
=head1 SEE ALSO