Fix: add canEdit to connector modal (#812)

tastyigniter · Jul 5, 2021 · 63f2976 · 63f2976
1 parent e3c0328
commit 63f2976
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/app/admin/formwidgets/Connector.php b/app/admin/formwidgets/Connector.php
@@ -60,6 +60,11 @@ class Connector extends BaseFormWidget
      */
     public $sortable = FALSE;
 
+    /**
+     * @var bool Items can be edited.
+     */
+    public $editable = TRUE;
+
     public $popupSize;
 
     public function initialize()
@@ -68,12 +73,12 @@ public function initialize()
             'formName',
             'form',
             'prompt',
+            'editable',
             'sortable',
             'nameFrom',
             'descriptionFrom',
             'partial',
             'popupSize',
-            'canEdit',
         ]);
 
         $fieldName = $this->formField->getName(FALSE);
@@ -113,12 +118,12 @@ public function prepareVars()
         $this->vars['fieldItems'] = $this->processLoadValue() ?? [];
 
         $this->vars['prompt'] = $this->prompt;
+        $this->vars['editable'] = $this->editable;
         $this->vars['sortable'] = $this->sortable;
         $this->vars['nameFrom'] = $this->nameFrom;
         $this->vars['partial'] = $this->partial;
         $this->vars['descriptionFrom'] = $this->descriptionFrom;
         $this->vars['sortableInputName'] = $this->sortableInputName;
-        $this->vars['canEdit'] = $this->canEdit ?? true;
     }
 
     public function onLoadRecord()
@@ -213,15 +218,15 @@ protected function processSaveValue($value)
         $sortedIndexes = (array)post($this->sortableInputName);
         $sortedIndexes = array_flip($sortedIndexes);
 
-        $value = [];
+        $results = [];
         foreach ($items as $index => $item) {
-            $value[$index] = [
+            $results[$index] = [
                 $item->getKeyName() => $item->getKey(),
                 $this->sortColumnName => $sortedIndexes[$item->getKey()],
             ];
         }
 
-        return $value;
+        return $results;
     }
 
     protected function makeItemFormWidget($model, $context)

diff --git a/app/admin/formwidgets/connector/assets/js/connector.js b/app/admin/formwidgets/connector/assets/js/connector.js
@@ -16,12 +16,13 @@
 
     Connector.DEFAULTS = {
         alias: undefined,
+        editable: true,
         sortableHandle: '.connector-item-handle',
         sortableContainer: '.field-connector-items',
     }
 
     Connector.prototype.init = function () {
-        if (this.options.canEdit)
+        if (this.options.editable)
             this.$el.on('click', '[data-control="load-item"]', $.proxy(this.onLoadItem, this))
 
         this.$el.on('click', '[data-control="delete-item"]', $.proxy(this.onDeleteItem, this))

diff --git a/app/admin/formwidgets/connector/connector.blade.php b/app/admin/formwidgets/connector/connector.blade.php
@@ -5,7 +5,7 @@ class="field-connector"
     data-alias="{{ $this->alias }}"
     data-sortable-container="#{{ $this->getId('items') }}"
     data-sortable-handle=".{{ $this->getId('items') }}-handle"
-    data-editable="{{ $canEdit }}"
+    data-editable="{{ $editable ? 'true' : 'false' }}"
 >
     <div
         id="{{ $this->getId('items') }}"