From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Mon, 28 Dec 2020 16:33:11 +0000 (+0100)
Subject: Zeiterfassung: Mitarbeiter ändern können bei entspr. Recht
X-Git-Tag: kivitendo-mebil_0.1-0~9^2~326
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5c399b8268285b0561c07e7deb6506de040c2aa4;p=kivitendo-erp.git

Zeiterfassung: Mitarbeiter ändern können bei entspr. Recht
---

diff --git a/SL/Controller/TimeRecording.pm b/SL/Controller/TimeRecording.pm
index b72b0d15d..44d54ca99 100644
--- a/SL/Controller/TimeRecording.pm
+++ b/SL/Controller/TimeRecording.pm
@@ -121,9 +121,12 @@ sub init_time_recording {
     }
   }
 
-  $attributes{employee_id}     = SL::DB::Manager::Employee->current->id;
+  # do not overwright staff member if you do not have the right
+  delete $attributes{staff_member_id} if !$_[0]->can_edit_all;
   $attributes{staff_member_id} = SL::DB::Manager::Employee->current->id if $is_new;
 
+  $attributes{employee_id}     = SL::DB::Manager::Employee->current->id;
+
   $time_recording->assign_attributes(%attributes);
 
   return $time_recording;
diff --git a/templates/webpages/time_recording/form.html b/templates/webpages/time_recording/form.html
index 119de5cc7..f0d4c1ebb 100644
--- a/templates/webpages/time_recording/form.html
+++ b/templates/webpages/time_recording/form.html
@@ -2,6 +2,7 @@
 [% USE P %]
 [% USE T8 %]
 [% USE LxERP %]
+[% USE HTML %]
 
 <h1>[% title %]</h1>
 
@@ -19,6 +20,7 @@
       <th>[% 'Type' | $T8 %]</th>
       <th>[% 'Project' | $T8 %]</th>
       <th>[% 'Description' | $T8 %]</th>
+      <th>[% 'Mitarbeiter' | $T8 %]</th>
     </thead>
     <tbody valign="top">
       <td>
@@ -35,6 +37,17 @@
       <td>[% P.select_tag('time_recording.type_id', SELF.all_time_recording_types, default=SELF.time_recording.type.id, with_empty=1, title_key='abbreviation') %]</td>
       <td>[% P.project.picker('time_recording.project_id', SELF.time_recording.project_id, style='width: 300px') %]</td>
       <td>[% L.textarea_tag('time_recording.description', SELF.time_recording.description, wrap="soft", style="width: 350px; height: 150px", class="texteditor", "data-validate"="required", "data-title"=LxERP.t8('Description')) %]</td>
+      <td>
+        [%- IF SELF.can_edit_all -%]
+          [% L.select_tag('time_recording.staff_member_id', SELF.all_employees,
+                           default    => SELF.time_recording.staff_member_id,
+                           title_key  => 'safe_name',
+                           value_key  => 'id',
+                           style      => 'width: 200px') %]
+        [%- ELSE -%]
+          [% SELF.time_recording.staff_member.safe_name | html %]
+        [%- END -%]
+      </td>
     </tbody>
   </table>