X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=1c308dac736b4fcc2d8d4ae84db4bc035bba8bfa;hb=96d3ef850a6170a3cbada36eb7f375ef99efe373;hp=f54ffefec646babff01c922a3721bdcc2bc054fc;hpb=83914eeb2e95cdf587565952eef54be59dd58693;p=kivitendo-erp.git diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl index f54ffefec..1c308dac7 100644 --- a/bin/mozilla/common.pl +++ b/bin/mozilla/common.pl @@ -91,7 +91,7 @@ sub select_part_internal { my ($new_item, $callback_sub); - my $re = "^new_.*_" . $form->{selection}; + my $re = "^new_.*_$form->{selection}\$"; foreach (grep /$re/, keys %{ $form }) { my $new_key = $_; @@ -127,9 +127,19 @@ sub part_selection_internal { $order_dir = 1; $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"})); - %options = map { $_ => 1 } split m/:/, $form->{options}; + my %options; - map { $form->{$_} = 1 if ($options{$_}) } qw(no_services no_assemblies stockable); + foreach my $opt (split m/:/, $form->{options}) { + if ($opt =~ /=/) { + my ($key, $value) = split m/=/, $opt, 2; + $options{$key} = $value; + + } else { + $options{$opt} = 1; + } + } + + map { $form->{$_} = $options{$_} if ($options{$_}) } qw(no_services no_assemblies click_button); $parts = Common->retrieve_parts(\%myconfig, $form, $order_by, $order_dir); @@ -156,6 +166,8 @@ sub part_selection_internal { }, @header_sort); + $form->{formname} ||= 'Form'; + $form->{title} = $locale->text("Select a part"); $form->header(); print $form->parse_html_template("generic/part_selection", { "HEADER" => \@header, @@ -316,11 +328,11 @@ sub set_longdescription { # ------------------------------------------------------------------------- sub H { - return $form->quote_html($_[0]); + return $locale->quote_special_chars('HTML', $_[0]); } sub Q { - return $form->quote($_[0]); + return $locale->quote_special_chars('URL@HTML', $_[0]); } sub E {