X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/41a039692bf1d655df629fd833fd6d6d428eb29b..0b280f98054da74f79cbc9fdb3e9f4c23326be53:/bin/mozilla/admin.pl diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 37ac193c2..f3edde8e8 100644 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -41,6 +41,7 @@ use SL::Form; use SL::User; use SL::Common; use SL::Inifile; +use SL::DBUpgrade2; require "bin/mozilla/common.pl"; @@ -570,117 +571,52 @@ sub continue { } sub update_dataset { - - %needsupdate = User->dbneedsupdate(\%$form); - $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Update Dataset'); - $form->header; - - print qq| - - - -
-

$form->{title}

-|; - my $field_id = 0; - foreach $key (sort keys %needsupdate) { - if ($needsupdate{$key} ne $form->{dbversion}) { - $upd .= qq| $key\n|; - $form->{dbupdate} .= "db$key "; - $field_id++; - } - } - - chop $form->{dbupdate}; - - if ($form->{dbupdate}) { - - print qq| - -{script}> - - - - - - + my @need_updates = User->dbneedsupdate($form); + $form->{NEED_UPDATES} = \@need_updates; + $form->{ALL_UPDATED} = !scalar @need_updates; - - - - - - - - -
| . $locale->text('The following Datasets need to be updated') . qq|
- -$upd + $form->header(); + print $form->parse_html_template("admin/update_dataset"); +} -
+sub dbupdate { + $form->{stylesheet} = "lx-office-erp.css"; + $form->{title} = $locale->text("Dataset upgrade"); + $form->header(); - + my $rowcount = $form->{rowcount} * 1; + my @update_rows = grep { $form->{"update_$_"} } (1 .. $rowcount); + $form->{NOTHING_TO_DO} = !scalar @update_rows; + my $saved_form = save_form(); - + $| = 1; -{rpw}> + print $form->parse_html_template("admin/dbupgrade_all_header"); - + foreach my $i (@update_rows) { + restore_form($saved_form); -
+ map { $form->{$_} = $form->{"${_}_${i}"} } qw(dbname dbdriver dbhost dbport dbuser dbpasswd); -
- + my $controls = parse_dbupdate_controls($form, $form->{dbdriver}); -
- -|; + print $form->parse_html_template("admin/dbupgrade_header"); - } else { + $form->{dbupdate} = $form->{dbname}; + $form->{$form->{dbname}} = 1; - print $locale->text('All Datasets up to date!'); + User->dbupdate($form); + User->dbupdate2($form, $controls); + print $form->parse_html_template("admin/dbupgrade_footer"); } - print qq| - - - -|; - -} - -sub dbupdate { - $form->{"stylesheet"} = "lx-office-erp.css"; - $form->{"title"} = $main::locale->text("Dataset upgrade"); - $form->header(); - my $dbname = - join(" ", - map({ s/\s//g; s/^db//; $_; } - grep({ $form->{$_} } - split(/\s+/, $form->{"dbupdate"})))); - print($form->parse_html_template("dbupgrade/header", - { "dbname" => $dbname })); - - User->dbupdate(\%$form); - - print qq| -
- -| . $locale->text('Dataset updated!') . qq| - -
- -| . $locale->text("Continue") . qq||; - + print $form->parse_html_template("admin/dbupgrade_all_done"); } sub create_dataset {