]> wagnertech.de Git - kivitendo-erp.git/commitdiff
projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6bda747)
gelöschte Benutzer in ar/search ausblenden
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 10 Feb 2012 16:06:05 +0000 (17:06 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 10 Feb 2012 16:14:18 +0000 (17:14 +0100)
bin/mozilla/ar.pl patch | blob | history
templates/webpages/ar/search.html patch | blob | history

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index a6e122067512ee8e52fa1535fc68e9ed24969d13..cd30053ed5bce3dad0518d7cf8e7a5b31cb087e3 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1346,16 +1346,13 @@ sub search {
   $form->get_lists("projects"       => { "key" => "ALL_PROJECTS", "all" => 1 },
                    "departments"    => "ALL_DEPARTMENTS",
                    "customers"      => "ALL_VC",
   $form->get_lists("projects"       => { "key" => "ALL_PROJECTS", "all" => 1 },
                    "departments"    => "ALL_DEPARTMENTS",
                    "customers"      => "ALL_VC",
-                   "employees"    => "ALL_EMPLOYEES",
-                   "salesmen"     => "ALL_SALESMEN",
                    "business_types" => "ALL_BUSINESS_TYPES");
                    "business_types" => "ALL_BUSINESS_TYPES");
+  $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
   $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
 
   # constants and subs for template
   $form->{jsscript}  = 1;
   $form->{vc_keys}   = sub { "$_[0]->{name}--$_[0]->{id}" };
   $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
 
   # constants and subs for template
   $form->{jsscript}  = 1;
   $form->{vc_keys}   = sub { "$_[0]->{name}--$_[0]->{id}" };
-  $form->{employee_labels} = sub { $_[0]->{"name"} || $_[0]->{"login"} };
-  $form->{salesman_labels} = $form->{employee_labels};
 
   $form->header;
   print $form->parse_html_template('ar/search', { %myconfig });
 
   $form->header;
   print $form->parse_html_template('ar/search', { %myconfig });
diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index a70816efe40f6ca5eb73c6df2db33e74c6f67404..d0f529d2b8e320fd20cf16818f03185e2d2eb6e8 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -1,4 +1,5 @@
 [%- USE T8 %]
 [%- USE T8 %]
+[%- USE L %]
 <body>
 
  <form method=post name="search" action=[% script %]>
 <body>
 
  <form method=post name="search" action=[% script %]>
@@ -51,34 +52,11 @@
      </tr>
      <tr>
       <th align="right">[% 'Employee' | $T8 %]</th>
      </tr>
      <tr>
       <th align="right">[% 'Employee' | $T8 %]</th>
-      <td>
-             [%- INCLUDE 'generic/multibox.html'
-                  name          = 'employee_id',
-                  style         = 'width: 250px',
-                  DATA          =  ALL_EMPLOYEES,
-                  id_key        = 'id',
-                  label_sub     = 'employee_labels',
-                  limit         = vclimit,
-                  show_empty    = 1,
-                  allow_textbox = 0,
-                  default       = ' ',
-             -%]
-      </td>
+      <td>[% L.select_tag('employee_id', L.options_for_select(ALL_EMPLOYEES, title='safe_name', with_empty=1), style='width:250px') %]</td>
      </tr>
     <tr>
      <th align="right">[% 'Salesman' | $T8 %]</th>
      </tr>
     <tr>
      <th align="right">[% 'Salesman' | $T8 %]</th>
-     <td>
-            [%- INCLUDE 'generic/multibox.html'
-                 name          = 'salesman_id',
-                 style         = 'width: 250px',
-                 DATA          =  ALL_SALESMEN,
-                 id_key        = 'id',
-                 label_sub     = 'salesman_labels',
-                 limit         = vclimit,
-                 show_empty    = 1,
-                 allow_textbox = 0,
-            -%]
-     </td>
+     <td>[% L.select_tag('salesman_id', L.options_for_select(ALL_EMPLOYEES, title='safe_name', with_empty=1), style='width:250px') %]</td>
      </tr>
      <tr>
       <th align=right nowrap>[% 'Transaction description' | $T8 %]</th>
      </tr>
      <tr>
       <th align=right nowrap>[% 'Transaction description' | $T8 %]</th>
Unnamed repository; edit this file 'description' to name the repository.