X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=47de5b0446a22c7476809b370436f3dbee6d769b;hb=44718f3e03bc80b897629fe82c6a3af5ed3afed3;hp=7f557fb435a2d5563730d33a251e98da5e763c96;hpb=0c27df9b59417fcef923f18f6c33d6190dd94fa9;p=kivitendo-erp.git diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl index 7f557fb43..47de5b044 100644 --- a/bin/mozilla/common.pl +++ b/bin/mozilla/common.pl @@ -10,37 +10,8 @@ ###################################################################### use SL::Form; -use YAML; - use SL::Common; - -sub save_form { - $lxdebug->enter_sub(); - - my $old_form = YAML::Dump($form); - $old_form =~ s|!|!!|g; - $old_form =~ s|\n|!n|g; - $old_form =~ s|\r|!r|g; - - $lxdebug->leave_sub(); - - return $old_form; -} - -sub restore_form { - $lxdebug->enter_sub(); - - my ($old_form, $no_delete) = @_; - - map({ delete($form->{$_}); } keys(%{$form})) unless ($no_delete); - $old_form =~ s|!r|\r|g; - $old_form =~ s|!n|\n|g; - $old_form =~ s|!!|!|g; - my $new_form = YAML::Load($old_form); - map({ $form->{$_} = $new_form->{$_}; } keys(%{$new_form})); - - $lxdebug->leave_sub(); -} +use SL::MoreCommon; sub build_std_url { $lxdebug->enter_sub(); @@ -538,12 +509,16 @@ sub reformat_numbers { sub show_history { $lxdebug->enter_sub(); my $dbh = $form->dbconnect(\%myconfig); - + my ($sort, $sortby) = split(/\-\-/, $form->{order}); + $sort =~ s/.*\.(.*)/$1/; + $form->{title} = $locale->text("History"); $form->header(); print $form->parse_html_template( "common/show_history", { - "DATEN" => $form->get_history($dbh,$form->{input_name}), - "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0") + "DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}), + "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"), + uc($sort) => 1, + uc($sort)."BY" => $sortby } ); $dbh->disconnect();