a bugfix for sql report and a few more updates to the form system
This commit is contained in:
parent
4eaf8c3827
commit
ce6ee697f9
5 changed files with 29 additions and 513 deletions
|
|
@ -285,19 +285,23 @@ sub _storeQueries {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub _parsePlaceholderParams {
|
||||
my $self = shift;
|
||||
my $params = shift;
|
||||
my @placeholderParams;
|
||||
foreach my $param (split /\s*,\s*/, $params) {
|
||||
if($param =~ /^form:/) {
|
||||
$param = $session{form}{$'};
|
||||
} elsif ($param =~ /^query(\d):/) {
|
||||
$param = $self->{_query}{$1}{rowData}{$'};
|
||||
}
|
||||
$param = WebGUI::Macro::process($param);
|
||||
push(@placeholderParams, $param);
|
||||
}
|
||||
return \@placeholderParams;
|
||||
my $self = shift;
|
||||
my $params = shift;
|
||||
my @placeholderParams;
|
||||
foreach my $row (split(/\n/,$params)) {
|
||||
next unless $row ne "";
|
||||
my ($type,$field) = split(/:/,$row);
|
||||
chop($field);
|
||||
my $param;
|
||||
if($type =~ /^form/) {
|
||||
$param = $session{form}{$field};
|
||||
} elsif ($param =~ /^query(\d)/) {
|
||||
$param = $self->{_query}{$1}{rowData}{$field};
|
||||
}
|
||||
$param = WebGUI::Macro::process($param);
|
||||
push(@placeholderParams, $param);
|
||||
}
|
||||
return \@placeholderParams;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue