Merge branch 'dev-5' into dev-5.1

baserproject · Mar 3, 2024 · 26c6c90 · 26c6c90
2 parents 0cc8f5a + cba4e2e
commit 26c6c90
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/...bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomFields/index_list.php b/...bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomFields/index_list.php
@@ -22,6 +22,13 @@
 ?>
 
 
+<div class="bca-data-list__top">
+  <div class="bca-data-list__sub">
+    <!-- pagination -->
+    <?php $this->BcBaser->element('pagination') ?>
+  </div>
+</div>
+
 <table class="list-table bca-table-listup" id="ListTable">
   <thead class="bca-table-listup__thead">
   <tr>
@@ -84,3 +91,12 @@
   <?php endif; ?>
   </tbody>
 </table>
+
+<div class="bca-data-list__bottom">
+  <div class="bca-data-list__sub">
+    <!-- pagination -->
+    <?php $this->BcBaser->element('pagination') ?>
+    <!-- list-num -->
+    <?php $this->BcBaser->element('list_num') ?>
+  </div>
+</div>
diff --git a/plugins/bc-custom-content/src/Controller/Admin/CustomFieldsController.php b/plugins/bc-custom-content/src/Controller/Admin/CustomFieldsController.php
@@ -34,7 +34,13 @@ class CustomFieldsController extends CustomContentAdminAppController
      */
     public function index(CustomFieldsAdminServiceInterface $service)
     {
-        $this->set(['entities' => $this->paginate($service->getIndex($this->getRequest()->getQueryParams()))]);
+        $this->set([
+            'entities' => $this->paginate(
+                $service->getIndex(
+                    $this->getRequest()->getQueryParams()
+                )
+            )
+        ]);
     }
 
     /**