Merge pull request #10656 from sarjon/fix-grid-id-in-js

Fix grid ids in migrated JS
PrestaShop · Sep 25, 2018 · 973a5b4 · 973a5b4
2 parents 853d7f0 + 47a4a6f
commit 973a5b4
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/admin-dev/themes/new-theme/js/pages/email/index.js b/admin-dev/themes/new-theme/js/pages/email/index.js
@@ -38,7 +38,7 @@ import LinkRowActionExtension from '../../components/grid/extension/link-row-act
 const $ = window.$;
 
 $(() => {
-  const emailLogsGrid = new Grid('email_logs');
+  const emailLogsGrid = new Grid('emaillogs');
 
   emailLogsGrid.addExtension(new ReloadListActionExtension());
   emailLogsGrid.addExtension(new ExportToSqlManagerExtension());

diff --git a/admin-dev/themes/new-theme/js/pages/sql-manager/index.js b/admin-dev/themes/new-theme/js/pages/sql-manager/index.js
@@ -37,7 +37,7 @@ const $ = window.$;
 
 class SqlManagerPage {
   constructor() {
-    const requestSqlGrid = new Grid('request_sql');
+    const requestSqlGrid = new Grid('sqlrequest');
     requestSqlGrid.addExtension(new ReloadListActionExtension());
     requestSqlGrid.addExtension(new ExportToSqlManagerExtension());
     requestSqlGrid.addExtension(new FiltersResetExtension());

diff --git a/admin-dev/themes/new-theme/js/pages/webservice/index.js b/admin-dev/themes/new-theme/js/pages/webservice/index.js
@@ -36,7 +36,7 @@ import ColumnTogglingExtension from "../../components/grid/extension/column-togg
 const $ = window.$;
 
 $(() => {
-  const webserviceGrid = new Grid('webservice_key');
+  const webserviceGrid = new Grid('webservicekey');
 
   webserviceGrid.addExtension(new ReloadListActionExtension());
   webserviceGrid.addExtension(new ExportToSqlManagerExtension());

diff --git a/admin-dev/themes/new-theme/public/email.bundle.js b/admin-dev/themes/new-theme/public/email.bundle.js
diff --git a/admin-dev/themes/new-theme/public/sql_manager.bundle.js b/admin-dev/themes/new-theme/public/sql_manager.bundle.js
diff --git a/admin-dev/themes/new-theme/public/webservice.bundle.js b/admin-dev/themes/new-theme/public/webservice.bundle.js
diff --git a/src/Core/Grid/Presenter/GridPresenter.php b/src/Core/Grid/Presenter/GridPresenter.php
@@ -55,7 +55,7 @@ public function present(GridInterface $grid)
         $searchCriteria = $grid->getSearchCriteria();
         $data = $grid->getData();
         $presentedGrid = [
-            'id' => $definition->getId(),
+            'id' => strtolower($definition->getId()),
             'name' => $definition->getName(),
             'filter_form' => $grid->getFilterForm()->createView(),
             'columns' => $definition->getColumns()->toArray(),