From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 15 Nov 2012 12:46:54 +0000 (+0100)
Subject: Datenbankabfrage mit leerem Feld für employee_id vermeiden
X-Git-Tag: release-3.0.0beta2~12^2~10
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8af39a65f18765dc26b93a8b25bfdd21dad5812c;p=kivitendo-erp.git

Datenbankabfrage mit leerem Feld für employee_id vermeiden

Fixt #2055.
---

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 391ec1a00..a6050945c 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -341,8 +341,9 @@ sub form_header {
                    "price_factors" => "ALL_PRICE_FACTORS");
 
   # label subs
-  $TMPL_VAR{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
-  $TMPL_VAR{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id},  deleted => 0 ] ]);
+  my $employee_list_query_gen      = sub { $::form->{$_[0]} ? [ or => [ id => $::form->{$_[0]}, deleted => 0 ] ] : [ deleted => 0 ] };
+  $TMPL_VAR{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all(query => $employee_list_query_gen->('employee_id'));
+  $TMPL_VAR{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all(query => $employee_list_query_gen->('salesman_id'));
   $TMPL_VAR{ALL_SHIPTO}            = SL::DB::Manager::Shipto->get_all(query => [
     or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
   ]);