Support showSetup in list views of the RelationController

wintercms · Nov 4, 2023 · 539ad66 · 539ad66
1 parent 9486aca
commit 539ad66
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
@@ -665,6 +665,7 @@ protected function makeViewWidget()
             $config = $this->makeConfigForMode('view', 'list');
             $config->model = $this->relationModel;
             $config->alias = $this->alias . 'ViewList';
+            $config->showSetup = $this->getConfig('view[showSetup]', true);
             $config->showSorting = $this->getConfig('view[showSorting]', true);
             $config->defaultSort = $this->getConfig('view[defaultSort]');
             $config->recordsPerPage = $this->getConfig('view[recordsPerPage]');
@@ -814,7 +815,7 @@ protected function makeManageWidget()
             $config = $this->makeConfigForMode('manage', 'list');
             $config->model = $this->relationModel;
             $config->alias = $this->alias . 'ManageList';
-            $config->showSetup = false;
+            $config->showSetup = $this->getConfig('manage[showSetup]', !$isPivot);
             $config->showCheckboxes = $this->getConfig('manage[showCheckboxes]', !$isPivot);
             $config->showSorting = $this->getConfig('manage[showSorting]', !$isPivot);
             $config->defaultSort = $this->getConfig('manage[defaultSort]');

diff --git a/modules/backend/widgets/lists/partials/_list_head_row.php b/modules/backend/widgets/lists/partials/_list_head_row.php
@@ -45,6 +45,7 @@ class="list-cell-name-<?= $column->getName() ?> list-cell-type-<?= $column->type
     <?php if ($showSetup): ?>
         <th class="list-setup">
             <a href="javascript:;"
+                id="<?= $this->getId('setupButton') ?>"
                 title="<?= e(trans('backend::lang.list.setup_title')) ?>"
                 data-control="popup"
                 data-handler="<?= $this->getEventHandler('onLoadSetup') ?>"></a>

diff --git a/modules/backend/widgets/lists/partials/_setup_form.php b/modules/backend/widgets/lists/partials/_setup_form.php
@@ -1,4 +1,4 @@
-<?= Form::open() ?>
+<?= Form::open(['data-request-parent' => '#' . $this->getId('setupButton')]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
         <h4 class="modal-title"><?= e(trans('backend::lang.list.setup_title')) ?></h4>