Revision 9aaca433
Von Moritz Bunkus vor etwa 17 Jahren hinzugefügt
| sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl | ||
|---|---|---|
| 13 | 13 |
sub myshowerror {
|
| 14 | 14 |
my ($msg) = @_; |
| 15 | 15 |
|
| 16 |
print($main::form->parse_html_template2("dbupgrade/units_error",
|
|
| 17 |
{ "message" => $msg }));
|
|
| 16 |
print $main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg });
|
|
| 18 | 17 |
return 2; |
| 19 | 18 |
} |
| 20 | 19 |
|
| ... | ... | |
| 219 | 218 |
map({ push(@unknown_parts, { "name" => $_, "NEW_UNITS" => $ddbox }); }
|
| 220 | 219 |
sort({ lc($a) cmp lc($b) } keys(%unknown_dimension_units)));
|
| 221 | 220 |
|
| 222 |
print($form->parse_html_template2("dbupgrade/units_parts",
|
|
| 223 |
{ "NEW_BASE_UNIT_DDBOX" => $ddbox,
|
|
| 224 |
"UNKNOWN_PART_UNITS" => \@unknown_parts,
|
|
| 225 |
}));
|
|
| 221 |
print $form->parse_html_template("dbupgrade/units_parts",
|
|
| 222 |
{ "NEW_BASE_UNIT_DDBOX" => $ddbox,
|
|
| 223 |
"UNKNOWN_PART_UNITS" => \@unknown_parts,
|
|
| 224 |
});
|
|
| 226 | 225 |
|
| 227 | 226 |
return 2; |
| 228 | 227 |
|
| 229 | 228 |
} else {
|
| 230 |
print($form->parse_html_template2("dbupgrade/units_parts_done"));
|
|
| 229 |
print $form->parse_html_template("dbupgrade/units_parts_done");
|
|
| 231 | 230 |
} |
| 232 | 231 |
|
| 233 | 232 |
if (scalar(keys(%unknown_service_units)) != 0) {
|
| ... | ... | |
| 238 | 237 |
map({ push(@unknown_services, { "name" => $_, "NEW_UNITS" => $ddbox }); }
|
| 239 | 238 |
sort({ lc($a) cmp lc($b) } keys(%unknown_service_units)));
|
| 240 | 239 |
|
| 241 |
print($form->parse_html_template2("dbupgrade/units_services",
|
|
| 242 |
{ "NEW_BASE_UNIT_DDBOX" => $ddbox,
|
|
| 243 |
"UNKNOWN_PART_UNITS" => \@unknown_services,
|
|
| 244 |
}));
|
|
| 240 |
print $form->parse_html_template("dbupgrade/units_services",
|
|
| 241 |
{ "NEW_BASE_UNIT_DDBOX" => $ddbox,
|
|
| 242 |
"UNKNOWN_PART_UNITS" => \@unknown_services,
|
|
| 243 |
})); |
|
| 245 | 244 |
|
| 246 | 245 |
return 2; |
| 247 | 246 |
|
| 248 | 247 |
} else {
|
| 249 |
print($form->parse_html_template2("dbupgrade/units_services_done"));
|
|
| 248 |
print $form->parse_html_template("dbupgrade/units_services_done");
|
|
| 250 | 249 |
} |
| 251 | 250 |
|
| 252 | 251 |
return 0; |
| ... | ... | |
| 271 | 270 |
my $service_units = retrieve_units(\%dbup_myconfig, $form, "service"); |
| 272 | 271 |
my $service_ddbox = unit_select_data($service_units); |
| 273 | 272 |
|
| 274 |
print($form->parse_html_template2("dbupgrade/units_set_default",
|
|
| 275 |
{ "DIMENSION_DDBOX" => $dimension_ddbox,
|
|
| 276 |
"SERVICE_DDBOX" => $service_ddbox }));
|
|
| 273 |
print $form->parse_html_template("dbupgrade/units_set_default",
|
|
| 274 |
{ "DIMENSION_DDBOX" => $dimension_ddbox,
|
|
| 275 |
"SERVICE_DDBOX" => $service_ddbox });
|
|
| 277 | 276 |
return 2; |
| 278 | 277 |
|
| 279 | 278 |
} else {
|
| 280 |
print($form->parse_html_template2("dbupgrade/units_set_default_done"));
|
|
| 279 |
print $form->parse_html_template("dbupgrade/units_set_default_done");
|
|
| 281 | 280 |
return 1; |
| 282 | 281 |
} |
| 283 | 282 |
} |
| ... | ... | |
| 330 | 329 |
|
| 331 | 330 |
my $res; |
| 332 | 331 |
|
| 333 |
print($form->parse_html_template2("dbupgrade/units_header"));
|
|
| 332 |
print $form->parse_html_template("dbupgrade/units_header");
|
|
| 334 | 333 |
|
| 335 | 334 |
if ($form->{"action2"} eq "add_unit") {
|
| 336 | 335 |
$res = update_units_add_unit(); |
Auch abrufbar als: Unified diff
Die Funktion Form::parse_html_template2() in Form::parse_html_template() umbenannt (letztere wurde in Revision 2923 entfernt).