metainfo: Ablaufoptimierungen (#4878)

redaxo · Nov 3, 2021 · ab8b982 · ab8b982
1 parent 08fa56e
commit ab8b982
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/redaxo/src/addons/metainfo/lib/handler/category_handler.php b/redaxo/src/addons/metainfo/lib/handler/category_handler.php
@@ -117,7 +117,7 @@ public function extendForm(rex_extension_point $ep)
 rex_extension::register('CAT_FORM_ADD', [$catHandler, 'extendForm']);
 rex_extension::register('CAT_FORM_EDIT', [$catHandler, 'extendForm']);
 
-rex_extension::register('CAT_ADDED', [$catHandler, 'extendForm']);
-rex_extension::register('CAT_UPDATED', [$catHandler, 'extendForm']);
+rex_extension::register('CAT_ADDED', [$catHandler, 'extendForm'], rex_extension::EARLY);
+rex_extension::register('CAT_UPDATED', [$catHandler, 'extendForm'], rex_extension::EARLY);
 
 rex_extension::register('CAT_FORM_BUTTONS', [$catHandler, 'renderToggleButton']);
diff --git a/redaxo/src/addons/metainfo/lib/handler/clang_handler.php b/redaxo/src/addons/metainfo/lib/handler/clang_handler.php
@@ -91,7 +91,7 @@ public function extendForm(rex_extension_point $ep)
 rex_extension::register('CLANG_FORM_ADD', [$clangHandler, 'extendForm']);
 rex_extension::register('CLANG_FORM_EDIT', [$clangHandler, 'extendForm']);
 
-rex_extension::register('CLANG_ADDED', [$clangHandler, 'extendForm']);
-rex_extension::register('CLANG_UPDATED', [$clangHandler, 'extendForm']);
+rex_extension::register('CLANG_ADDED', [$clangHandler, 'extendForm'], rex_extension::EARLY);
+rex_extension::register('CLANG_UPDATED', [$clangHandler, 'extendForm'], rex_extension::EARLY);
 
 rex_extension::register('CLANG_FORM_BUTTONS', [$clangHandler, 'renderToggleButton']);
diff --git a/redaxo/src/addons/metainfo/lib/handler/handler.php b/redaxo/src/addons/metainfo/lib/handler/handler.php
@@ -653,14 +653,14 @@ protected static function getSqlFields($prefix, $filterCondition = '')
      *
      * @return string
      */
-    public function renderFormAndSave($prefix, array $params)
+    public function renderFormAndSave($prefix, array $params, bool $fireCallbacks = true)
     {
         $filterCondition = $this->buildFilterCondition($params);
         $sqlFields = static::getSqlFields($prefix, $filterCondition);
         $params = $this->handleSave($params, $sqlFields);
 
         // trigger callback of sql fields
-        if ('post' == rex_request_method()) {
+        if ($fireCallbacks && 'post' == rex_request_method()) {
             $this->fireCallbacks($sqlFields);
         }
 

diff --git a/redaxo/src/addons/metainfo/lib/handler/media_handler.php b/redaxo/src/addons/metainfo/lib/handler/media_handler.php
@@ -163,8 +163,8 @@ protected function handleSave(array $params, rex_sql $sqlFields)
 
         parent::fetchRequestValues($params, $media, $sqlFields);
 
-        // do the save only when metafields are defined
-        if ($media->hasValues()) {
+        // do the save only when EP = MEDIA_ADDED/UPDATED and metafields are defined
+        if ($params['save'] && $media->hasValues()) {
             $media->update();
         }
 
@@ -179,6 +179,8 @@ protected function renderFormItem($field, $tag, $tagAttr, $id, $label, $labelIt,
     public function extendForm(rex_extension_point $ep)
     {
         $params = $ep->getParams();
+        $params['save'] = $save = in_array($ep->getName(), ['MEDIA_ADDED', 'MEDIA_UPDATED'], true);
+
         // Nur beim EDIT gibts auch ein Medium zum bearbeiten
         if ('MEDIA_FORM_EDIT' == $ep->getName()) {
             $params['activeItem'] = $params['media'];
@@ -194,7 +196,7 @@ public function extendForm(rex_extension_point $ep)
             }
         }
 
-        return $ep->getSubject() . parent::renderFormAndSave(self::PREFIX, $params);
+        return $ep->getSubject() . parent::renderFormAndSave(self::PREFIX, $params, $save);
     }
 }
 
@@ -203,7 +205,7 @@ public function extendForm(rex_extension_point $ep)
 rex_extension::register('MEDIA_FORM_EDIT', [$mediaHandler, 'extendForm']);
 rex_extension::register('MEDIA_FORM_ADD', [$mediaHandler, 'extendForm']);
 
-rex_extension::register('MEDIA_ADDED', [$mediaHandler, 'extendForm']);
-rex_extension::register('MEDIA_UPDATED', [$mediaHandler, 'extendForm']);
+rex_extension::register('MEDIA_ADDED', [$mediaHandler, 'extendForm'], rex_extension::EARLY);
+rex_extension::register('MEDIA_UPDATED', [$mediaHandler, 'extendForm'], rex_extension::EARLY);
 
 rex_extension::register('MEDIA_IS_IN_USE', [rex_metainfo_media_handler::class, 'isMediaInUse']);