Changeset 3748373 for dienstplan/trunk/src/Dienstplan/EntryActions.php

Timestamp:

10/15/2026 11:59:50 AM (45 hours ago)

Author:

wpdienstplan

Message:

Update to version 3.10.0 from GitHub

File:

• dienstplan/trunk/src/Dienstplan/EntryActions.php (modified) (7 diffs)

dienstplan/trunk/src/Dienstplan/EntryActions.php

@@ -20 +20 @@
      * @param array{
      *   user_id: int,
-     *   is_admin: bool,
+     *   can_manage_plan?: bool,
+     *   is_admin?: bool,
      *   is_past?: bool,
      *   type?: array<string, mixed>|null,
@@ -37 +38 @@
     public static function forShift(array $shift, array $context): array
     {
-        $userId  = (int) ($context['user_id'] ?? 0);
-        $isAdmin = ! empty($context['is_admin']);
-        $actions = [];
-
-        if ($isAdmin) {
+        $userId        = (int) ($context['user_id'] ?? 0);
+        $canManagePlan = ! empty( $context['can_manage_plan'] ) || ! empty( $context['is_admin'] );
+        $actions       = [];
+
+        if ($canManagePlan) {
             $actions[] = [
                 'key'         => 'remove',
@@ -59 +60 @@
          * @param array<string, mixed>             $shift
          * @param int                              $userId
-         * @param bool                             $isAdmin
+         * @param bool                             $canManagePlan Darf diesen Plan verwalten (Admin oder Schichtleiter).
          */
-        $filtered = apply_filters('dienstplan_entry_actions', $actions, $shift, $userId, $isAdmin);
+        $filtered = apply_filters('dienstplan_entry_actions', $actions, $shift, $userId, $canManagePlan);
 
         if (!is_array($filtered)) {
@@ -157 +158 @@
         $headerLine  = implode(' · ', $headerParts);
 
-        /* translators: 1: person name, 2: shift type and date summary */
         $ariaLabel = sprintf(
+            /* translators: 1: person name, 2: shift type and date summary */
             __('Actions for %1$s, %2$s', 'dienstplan'),
             $displayName,
@@ -205 +206 @@
      * Shared assign / take-over member list for the calendar (once per shortcode).
      *
-     * @param list<\WP_User|\stdClass> $members Admin assignable members (may be empty).
-     * @return array{me: array{id: int, label: string}, members: list<array{id: int, label: string}>}
+     * @param list<\WP_User|\stdClass> $members Assignable members (may be empty).
+     * @return array{
+     *   me: array{id: int, label: string, qualified: array<int, bool>},
+     *   members: list<array{id: int, label: string, qualified: array<int, bool>}>
+     * }
      */
     public static function calendarMembersPayload(
@@ -221 +225 @@
             : __('Me', 'dienstplan');
 
-        $others = [];
+        /** @var array<int, bool> $meQualified */
+        $meQualified = [];
+        $others      = [];
         foreach ($members as $member) {
             $id = (int) ($member->ID ?? 0);
-            if ($id <= 0 || $id === $currentUserId) {
+            if ($id <= 0) {
                 continue;
             }
+            /** @var array<int, bool> $qualified */
+            $qualified = is_array( $member->qualified ?? null ) ? $member->qualified : [];
+            if ($id === $currentUserId) {
+                $meQualified = $qualified;
+                continue;
+            }
             $others[] = [
-                'id'    => $id,
-                'label' => (string) ($member->assign_label ?? $member->display_name ?? (string) $id),
+                'id'        => $id,
+                'label'     => (string) ($member->assign_label ?? $member->display_name ?? (string) $id),
+                'qualified' => $qualified,
             ];
         }
@@ -235 +248 @@
         return [
             'me'      => [
-                'id'    => $currentUserId,
-                'label' => $meLabel,
+                'id'        => $currentUserId,
+                'label'     => $meLabel,
+                'qualified' => $meQualified,
             ],
             'members' => $others,