restart apache2 in postinst

[mfinanz.git] / SL / Controller / PartsPriceUpdate.pm

diff --git a/SL/Controller/PartsPriceUpdate.pm b/SL/Controller/PartsPriceUpdate.pm
index 8481998d4c4c61232134cea89a553e6055d8d30c..738f29693c7d10a60a7c4aa50989ec7644b41b94 100644 (file)
--- a/SL/Controller/PartsPriceUpdate.pm
+++ b/SL/Controller/PartsPriceUpdate.pm
@@ -92,7 +92,7 @@ sub _create_filter_for_priceupdate {
   my @where_values;
   my $where = '1 = 1';
 
-  for my $item (qw(partnumber drawing microfiche make model pg.partsgroup description serialnumber)) {
+  for my $item (qw(partnumber drawing microfiche pg.partsgroup description serialnumber)) {
     my $column = $item;
     $column =~ s/.*\.//;
     next unless $filter->{$column};
@@ -130,10 +130,14 @@ sub _create_filter_for_priceupdate {
 
   }
 
-  for my $column (qw(make model)) {
-    next unless ($filter->{$column});
-    $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE $column ILIKE ?|;
-    push @where_values, "%$filter->{$column}%";
+  if ($filter->{make}) {
+    $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE make = ?) |;
+    push @where_values, $filter->{make};
+  }
+
+  if ($filter->{model}) {
+    $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE model ILIKE ?) |;
+    push @where_values, "%$filter->{model}%";
   }
 
   return ($where, @where_values);
@@ -273,7 +277,7 @@ sub init_pricegroups_by_id {
 }
 
 sub check_rights {
-  $::auth->assert('part_service_assembly_edit');
+  $::auth->assert('part_service_assembly_edit & part_service_assembly_edit_prices');
 }
 
 sub init_filter {