Elements: not necessary to have the widgetId persisted on the element…

… option xibosignage/xibo#3151
dasgarner · Sep 15, 2023 · 952ad13 · 952ad13
1 parent 0dc49bf
commit 952ad13
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/lib/Entity/Widget.php b/lib/Entity/Widget.php
@@ -973,18 +973,6 @@ public function save($options = [])
             foreach ($this->widgetOptions as $widgetOption) {
                 // Assert the widgetId
                 $widgetOption->widgetId = $this->widgetId;
-
-                // Handle widgetId inside of the option value
-                if ($options['import'] && $widgetOption->option === 'elements') {
-                    $widgetElements = $this->getOptionValue('elements', null);
-                    $widgetElements = json_decode($widgetElements, true);
-                    foreach ($widgetElements as $widgetIndex => $widgetElement) {
-                        $widgetElements[$widgetIndex]['widgetId'] = $this->widgetId;
-                    }
-
-                    $this->setOptionValue('elements', 'raw', json_encode($widgetElements));
-                }
-
                 $widgetOption->save();
             }
         }

diff --git a/lib/Widget/Render/WidgetHtmlRenderer.php b/lib/Widget/Render/WidgetHtmlRenderer.php
@@ -585,6 +585,9 @@ private function render(
 
                 // Join together the template properties for this element, and the element properties
                 foreach ($widgetElements as $widgetIndex => $widgetElement) {
+                    // Assert the widgetId
+                    $widgetElements[$widgetIndex]['widgetId'] = $widget->widgetId;
+
                     foreach (($widgetElement['elements'] ?? []) as $elementIndex => $element) {
                         $this->getLog()->debug('render: elements: processing widget index ' . $widgetIndex
                             . ', element index ' . $elementIndex . ' with id ' . $element['id']);

diff --git a/ui/src/editor-core/widget.js b/ui/src/editor-core/widget.js
@@ -741,7 +741,6 @@ Widget.prototype.saveElements = function(
     dataType: 'json',
     data: JSON.stringify([
       {
-        widgetId: widgetId,
         elements: elementsToSave,
       },
     ]),