projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix error message when an action isn't selected
[freeside.git]
/
httemplate
/
edit
/
process
/
part_event.html
diff --git
a/httemplate/edit/process/part_event.html
b/httemplate/edit/process/part_event.html
index
bac6924
..
4d52e7b
100644
(file)
--- a/
httemplate/edit/process/part_event.html
+++ b/
httemplate/edit/process/part_event.html
@@
-39,8
+39,8
@@
split(/\0/, $value)
};
} elsif ( $info->{'type'} eq 'freq' ) {
split(/\0/, $value)
};
} elsif ( $info->{'type'} eq 'freq' ) {
- $value = '0' if !length($value);
- $value .= $params->{$cgi_field.'_units'};
+ $value = '0' if !length($value)
and !$info->{'allow_blank'}
;
+ $value .= $params->{$cgi_field.'_units'}
if length($value)
;
}
#warn "value of $cgi_field is $value\n";
}
#warn "value of $cgi_field is $value\n";
@@
-75,13
+75,13
@@
}
( $option => $value );
}
}
( $option => $value );
}
- @{ $object->option_fields_listref };
+ @{ $object->option_fields_listref
|| []
};
},
'precheck_callback' => sub {
my $cgi = shift;
my $action = $cgi->param('action') or return;
},
'precheck_callback' => sub {
my $cgi = shift;
my $action = $cgi->param('action') or return;
- my %actionfields = map { $_ =~ /^$action\.(.*)/; $1 =>
$cgi->param($_
) }
+ my %actionfields = map { $_ =~ /^$action\.(.*)/; $1 =>
scalar($cgi->param($_)
) }
grep { /^$action\./ } $cgi->param;
if ( exists($actionfields{'reasonnum'}) and
length($actionfields{'reasonnum'}) == 0 ) {
grep { /^$action\./ } $cgi->param;
if ( exists($actionfields{'reasonnum'}) and
length($actionfields{'reasonnum'}) == 0 ) {
@@
-99,8
+99,10
@@
next unless $cgi->param($1) eq 'balance_age';
my $errstr = FS::part_event::Condition::balance_age->
next unless $cgi->param($1) eq 'balance_age';
my $errstr = FS::part_event::Condition::balance_age->
- check_options( { age => $cgi->param($param),
- age_units => $cgi->param("${param}_units") } );
+ check_options( { age => scalar($cgi->param($param)),
+ age_units => scalar($cgi->param("${param}_units")),
+ }
+ );
return $errstr if $errstr;
}
return $errstr if $errstr;
}