Merge branch 'pu/pm/DelegatedUpdateCreateRightFromTbToAdb' into '2024.11'

tweak(TB/Adb) move right upgrade update/create from TB to Adb controller

See merge request tine20/tine20!5380

Author: paulmhh

tine20/Addressbook/Controller/Contact.php

@@ -6,7 +6,7 @@
  * @subpackage  Controller
  * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
  * @author      Lars Kneschke <[email protected]>
- * @copyright   Copyright (c) 2007-2023 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @copyright   Copyright (c) 2007-2024 Metaways Infosystems GmbH (http://www.metaways.de)
  * 
  */
 
@@ -1689,4 +1689,27 @@ public static function modelConfigHook(array &$_fields, Tinebase_ModelConfigurat
         }
         $mc->setJsonExpander($expanderDef);
     }
+
+    protected function _checkDelegatedGrant(Tinebase_Record_Interface $_record,
+                                            string $_action,
+                                            bool $_throw,
+                                            string $_errorMessage,
+                                            ?Tinebase_Record_Interface $_oldRecord): bool
+    {
+        $tead = null;
+        try {
+            if (parent::_checkDelegatedGrant($_record, $_action, $_throw, $_errorMessage, $_oldRecord)) {
+                return true;
+            }
+        } catch (Tinebase_Exception_AccessDenied $tead) {}
+
+        if ($_action === self::ACTION_CREATE) {
+            return parent::_checkDelegatedGrant($_record, self::ACTION_UPDATE, $_throw, $_errorMessage, $_oldRecord);
+        }
+
+        if (null !== $tead) {
+            throw $tead;
+        }
+        return false;
+    }
 }

tine20/Tinebase/Controller/Record/Abstract.php

@@ -2598,19 +2598,6 @@ protected function _checkDelegatedGrant(Tinebase_Record_Interface $_record,
             }
             return false;
         }
-        if ($_action === self::ACTION_CREATE) {
-            // check CREATE - if it does not suffice, UPDATE is ok, too
-            if ($ctrl->checkGrant(
-                $_record->{$mc->delegateAclField} instanceof Tinebase_Record_Interface ?
-                    $_record->{$mc->delegateAclField} :
-                    $ctrl->get($_record->{$mc->delegateAclField}),
-                $_action, false, $_errorMessage, $_oldRecord?->{$mc->delegateAclField}
-            )) {
-                return true;
-            } else {
-                $_action = self::ACTION_UPDATE;
-            }
-        }
 
         return $ctrl->checkGrant(
             $_record->{$mc->delegateAclField} instanceof Tinebase_Record_Interface ?