Lines 215-222
elsif ( $phase eq 'Update SQL'){
Link Here
|
215 |
'group' => $group, |
215 |
'group' => $group, |
216 |
'subgroup' => $subgroup, |
216 |
'subgroup' => $subgroup, |
217 |
'notes' => $notes, |
217 |
'notes' => $notes, |
218 |
'cache_expiry' => $cache_expiry, |
|
|
219 |
'cache_expiry_units' => $cache_expiry_units, |
220 |
'public' => $public, |
218 |
'public' => $public, |
221 |
'problematic_authvals' => $problematic_authvals, |
219 |
'problematic_authvals' => $problematic_authvals, |
222 |
'warn_authval_problem' => 1, |
220 |
'warn_authval_problem' => 1, |
Lines 231-237
elsif ( $phase eq 'Update SQL'){
Link Here
|
231 |
group => $group, |
229 |
group => $group, |
232 |
subgroup => $subgroup, |
230 |
subgroup => $subgroup, |
233 |
notes => $notes, |
231 |
notes => $notes, |
234 |
cache_expiry => $cache_expiry, |
|
|
235 |
public => $public, |
232 |
public => $public, |
236 |
} ); |
233 |
} ); |
237 |
$template->param( |
234 |
$template->param( |
Lines 240-245
elsif ( $phase eq 'Update SQL'){
Link Here
|
240 |
'id' => $id, |
237 |
'id' => $id, |
241 |
); |
238 |
); |
242 |
} |
239 |
} |
|
|
240 |
if ( $usecache ) { |
241 |
$template->param( |
242 |
cache_expiry => $cache_expiry, |
243 |
cache_expiry_units => $cache_expiry_units, |
244 |
); |
245 |
} |
243 |
} |
246 |
} |
244 |
} |
247 |
} |
245 |
|
248 |
|
Lines 312-317
elsif ( $phase eq 'Choose these columns' ) {
Link Here
|
312 |
my $type = $input->param('type'); |
315 |
my $type = $input->param('type'); |
313 |
my @columns = $input->param('columns'); |
316 |
my @columns = $input->param('columns'); |
314 |
my $column = join( ',', @columns ); |
317 |
my $column = join( ',', @columns ); |
|
|
318 |
|
315 |
$template->param( |
319 |
$template->param( |
316 |
'build4' => 1, |
320 |
'build4' => 1, |
317 |
'area' => $area, |
321 |
'area' => $area, |
Lines 319-328
elsif ( $phase eq 'Choose these columns' ) {
Link Here
|
319 |
'column' => $column, |
323 |
'column' => $column, |
320 |
definitions => get_from_dictionary($area), |
324 |
definitions => get_from_dictionary($area), |
321 |
criteria => get_criteria($area,$input), |
325 |
criteria => get_criteria($area,$input), |
322 |
'cache_expiry' => $input->param('cache_expiry'), |
|
|
323 |
'cache_expiry_units' => $input->param('cache_expiry_units'), |
324 |
'public' => $input->param('public'), |
326 |
'public' => $input->param('public'), |
325 |
); |
327 |
); |
|
|
328 |
if ( $usecache ) { |
329 |
$template->param( |
330 |
cache_expiry => $input->param('cache_expiry'), |
331 |
cache_expiry_units => $input->param('cache_expiry_units'), |
332 |
); |
333 |
} |
334 |
|
326 |
} |
335 |
} |
327 |
|
336 |
|
328 |
elsif ( $phase eq 'Choose these criteria' ) { |
337 |
elsif ( $phase eq 'Choose these criteria' ) { |
Lines 373-382
elsif ( $phase eq 'Choose these criteria' ) {
Link Here
|
373 |
'column' => $column, |
382 |
'column' => $column, |
374 |
'definition' => $definition, |
383 |
'definition' => $definition, |
375 |
'criteriastring' => $query_criteria, |
384 |
'criteriastring' => $query_criteria, |
376 |
'cache_expiry' => $input->param('cache_expiry'), |
|
|
377 |
'cache_expiry_units' => $input->param('cache_expiry_units'), |
378 |
'public' => $input->param('public'), |
385 |
'public' => $input->param('public'), |
379 |
); |
386 |
); |
|
|
387 |
if ( $usecache ) { |
388 |
$template->param( |
389 |
cache_expiry => $input->param('cache_expiry'), |
390 |
cache_expiry_units => $input->param('cache_expiry_units'), |
391 |
); |
392 |
} |
380 |
|
393 |
|
381 |
# get columns |
394 |
# get columns |
382 |
my @columns = split( ',', $column ); |
395 |
my @columns = split( ',', $column ); |
Lines 555-567
elsif ( $phase eq 'Save Report' ) {
Link Here
|
555 |
'reportname' => $name, |
568 |
'reportname' => $name, |
556 |
'type' => $type, |
569 |
'type' => $type, |
557 |
'notes' => $notes, |
570 |
'notes' => $notes, |
558 |
'cache_expiry' => $cache_expiry, |
|
|
559 |
'cache_expiry_units' => $cache_expiry_units, |
560 |
'public' => $public, |
571 |
'public' => $public, |
561 |
'problematic_authvals' => $problematic_authvals, |
572 |
'problematic_authvals' => $problematic_authvals, |
562 |
'warn_authval_problem' => 1, |
573 |
'warn_authval_problem' => 1, |
563 |
'phase_save' => 1 |
574 |
'phase_save' => 1 |
564 |
); |
575 |
); |
|
|
576 |
if ( $usecache ) { |
577 |
$template->param( |
578 |
cache_expiry => $cache_expiry, |
579 |
cache_expiry_units => $cache_expiry_units, |
580 |
); |
581 |
} |
565 |
} else { |
582 |
} else { |
566 |
# No params problem found or asked to save anyway |
583 |
# No params problem found or asked to save anyway |
567 |
my $id = save_report( { |
584 |
my $id = save_report( { |
568 |
- |
|
|