]> 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: 7e6ad22)
gelöschte Benutzer in do/search ausblenden
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 10 Feb 2012 17:04:39 +0000 (18:04 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 13 Feb 2012 10:32:47 +0000 (11:32 +0100)
bin/mozilla/do.pl patch | blob | history
templates/webpages/do/search.html patch | blob | history

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 39cba4a2b5ef87e7d1f5f7c4e0421341472628c9..f06bd32565fb2a7ee840adfae6f4d924706e2eef 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -448,9 +448,8 @@ sub search {
 
   $form->get_lists("projects"     => { "key" => "ALL_PROJECTS",
                                        "all" => 1 },
 
   $form->get_lists("projects"     => { "key" => "ALL_PROJECTS",
                                        "all" => 1 },
-                   "employees"    => "ALL_EMPLOYEES",
-                   "salesmen"     => "ALL_SALESMEN",
                    "$form->{vc}s" => "ALL_VC");
                    "$form->{vc}s" => "ALL_VC");
+  $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
 
   $form->{SHOW_VC_DROP_DOWN} =  $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };
   $form->{jsscript}          = 1;
 
   $form->{SHOW_VC_DROP_DOWN} =  $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };
   $form->{jsscript}          = 1;
diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
index 811384c6f31d9ef63863dcb913b8565f5c4c014e..b2ad1704fa031406a056e93224ce0c62caf32793 100644 (file)
--- a/templates/webpages/do/search.html
+++ b/templates/webpages/do/search.html
@@ -1,4 +1,5 @@
 [%- USE T8 %]
 [%- USE T8 %]
+[%- USE L %]
 [% USE HTML %][% USE LxERP %]<body onload="on_load();">
 
  [%- IF vc == 'customer' %]
 [% USE HTML %][% USE LxERP %]<body onload="on_load();">
 
  [%- IF vc == 'customer' %]
@@ -72,27 +73,13 @@
 
     <tr>
      <th align="right">[% 'Employee' | $T8 %]</th>
 
     <tr>
      <th align="right">[% 'Employee' | $T8 %]</th>
-     <td>
-      <select name="employee_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
-       [%- END %]
-      </select>
-     </td>
+     <td>[% L.select_tag('employee_id', L.options_for_select(ALL_EMPLOYEES, title='safe_name', with_empty=1), class='fixed_width') %]</td>
     </tr>
 
     [%- IF is_customer %]
     <tr>
      <th align="right">[% 'Salesman' | $T8 %]</th>
     </tr>
 
     [%- IF is_customer %]
     <tr>
      <th align="right">[% 'Salesman' | $T8 %]</th>
-     <td>
-      <select name="salesman_id" class="fixed_width">
-       <option></option>
-       [%- FOREACH row = ALL_SALESMEN %]
-       <option value="[% HTML.escape(row.id) %]">[% IF row.name %][% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %][% END %]</option>
-       [%- END %]
-      </select>
-     </td>
+     <td>[% L.select_tag('salesman_id', L.options_for_select(ALL_EMPLOYEES, title='safe_name', with_empty=1), class='fixed_width') %]</td>
     </tr>
     [%- END %]
 
     </tr>
     [%- END %]
 
Unnamed repository; edit this file 'description' to name the repository.