From 2b588d075d38e0f68cf961a689cca1a1fc77d8ca Mon Sep 17 00:00:00 2001 From: okom3pom Date: Tue, 4 May 2021 13:39:50 +0200 Subject: [PATCH 1/2] ps_mainmenu edit link get insert link dialog --- ps_mainmenu.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ps_mainmenu.php b/ps_mainmenu.php index 44ada05..00c9ad5 100644 --- a/ps_mainmenu.php +++ b/ps_mainmenu.php @@ -1127,7 +1127,7 @@ public function renderAddForm() $fields_form = [ 'form' => [ 'legend' => [ - 'title' => (Tools::getIsset('updatelinksmenutop') && Tools::getValue('updatelinksmenutop')) ? + 'title' => Tools::getValue('id_linksmenutop') && !Tools::isSubmit('updatelink') ? $this->trans('Update link', [], 'Modules.Mainmenu.Admin') : $this->trans('Add a new link', [], 'Modules.Mainmenu.Admin'), 'icon' => 'icon-link', ], @@ -1180,7 +1180,7 @@ public function renderAddForm() $helper->identifier = $this->identifier; $helper->fields_value = $this->getAddLinkFieldsValues(); - if (Tools::getIsset('updatelinksmenutop') && Tools::getValue('updatelinksmenutop')) { + if (Tools::getValue('id_linksmenutop') && !Tools::isSubmit('updatelink')) { $fields_form['form']['submit'] = [ 'name' => 'updatelinksmenutop', 'title' => $this->trans('Update', [], 'Admin.Actions'), From 472436197fdfa212f51cc1179e81e1c80d3a5c1b Mon Sep 17 00:00:00 2001 From: Thomas BACCELLI Date: Fri, 2 Jul 2021 15:17:47 +0200 Subject: [PATCH 2/2] Fix cs --- ps_mainmenu.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ps_mainmenu.php b/ps_mainmenu.php index 00c9ad5..3484ec4 100644 --- a/ps_mainmenu.php +++ b/ps_mainmenu.php @@ -105,6 +105,7 @@ public function install($delete_params = true) if ($delete_params) { if ($this->uninstallPrestaShop16Module()) { Configuration::deleteByName('MOD_BLOCKTOPMENU_SEARCH'); + return true; } if (!$this->installDb() || !Configuration::updateGlobalValue('MOD_BLOCKTOPMENU_ITEMS', 'CAT3,CAT6,CAT9')) { @@ -184,12 +185,13 @@ public function uninstallPrestaShop16Module() if ($oldModule) { // This closure calls the parent class to prevent data to be erased // It allows the new module to be configured without migration - $parentUninstallClosure = function() { + $parentUninstallClosure = function () { return parent::uninstall(); }; $parentUninstallClosure = $parentUninstallClosure->bindTo($oldModule, get_class($oldModule)); $parentUninstallClosure(); } + return true; }