Entwürfe: nur die eigenen Entwürfe anzeigen

diff --git a/SL/Controller/Draft.pm b/SL/Controller/Draft.pm
index a450e2c9f58375a44e0af26f7458969004342e8f..8ad37ced6f8fb0f9f88ee5eae70509c864a25808 100644 (file)
--- a/SL/Controller/Draft.pm
+++ b/SL/Controller/Draft.pm
@@ -131,11 +131,12 @@ sub _build_form {
 sub draft_list {
   my ($self) = @_;
 
 sub draft_list {
   my ($self) = @_;
 

-  my $result = selectall_hashref_query($::form, $::form->get_standard_dbh, <<SQL, $self->module, $self->submodule);
-    SELECT d.*, date(d.itime) AS date, e.name AS employee_name
+  my $result = selectall_hashref_query($::form, $::form->get_standard_dbh, <<SQL, $self->module, $self->submodule, SL::DB::Manager::Employee->current->id);
+    SELECT d.*, date(d.itime) AS date

     FROM drafts d
     FROM drafts d

-    LEFT JOIN employee e ON d.employee_id = e.id
-    WHERE (d.module = ?) AND (d.submodule = ?)
+    WHERE (d.module      = ?)
+      AND (d.submodule   = ?)
+      AND (d.employee_id = ?)

     ORDER BY d.itime
 SQL
 }
     ORDER BY d.itime
 SQL
 }

diff --git a/templates/webpages/drafts/form.html b/templates/webpages/drafts/form.html
index f3cedf8cc6827294c120568050297c3873c3cc46..031b0a17c6ffe653a3d3c41176b29dc1f30673de 100644 (file)
--- a/templates/webpages/drafts/form.html
+++ b/templates/webpages/drafts/form.html
@@ -24,7 +24,6 @@
  <tr class="listheading">
   <th>[% 'Date' | $T8 %]</th>
   <th>[% 'Description' | $T8 %]</th>
  <tr class="listheading">
   <th>[% 'Date' | $T8 %]</th>
   <th>[% 'Description' | $T8 %]</th>

-  <th>[% 'Employee' | $T8 %]</th>

  </tr>
 
 [% FOREACH row = drafts_list %]
  </tr>
 
 [% FOREACH row = drafts_list %]


@@ -37,10 +36,8 @@
    [% L.link(SELF.url_for(action='load',id=row.id), row.description) %]
   [%- END %]
   </td>
    [% L.link(SELF.url_for(action='load',id=row.id), row.description) %]
   [%- END %]
   </td>

-  <td>[% row.employee_name | html %]</td>

   <td>[% L.html_tag('span', LxERP.t8('Delete'), class='cursor-pointer interact', onclick="kivi.Draft.delete('" _ row.id _ "')") %]</a></td>
  </tr>
 [% END %]
 </table>
 [%- END %]
   <td>[% L.html_tag('span', LxERP.t8('Delete'), class='cursor-pointer interact', onclick="kivi.Draft.delete('" _ row.id _ "')") %]</a></td>
  </tr>
 [% END %]
 </table>
 [%- END %]

-