From 34258f796314bd93c164b71364b08b79059168fd Mon Sep 17 00:00:00 2001 From: Jonas Raoni Soares da Silva Date: Mon, 16 Dec 2024 21:01:41 +0300 Subject: [PATCH 1/3] pkp/pkp-lib#10720 Fixed preview button --- templates/controllers/grid/navigationMenus/customNMIType.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/controllers/grid/navigationMenus/customNMIType.tpl b/templates/controllers/grid/navigationMenus/customNMIType.tpl index 4b45f9e0c8c..9129728cc77 100644 --- a/templates/controllers/grid/navigationMenus/customNMIType.tpl +++ b/templates/controllers/grid/navigationMenus/customNMIType.tpl @@ -22,7 +22,7 @@ {/fbvFormSection} {fbvFormSection class="formButtons"} - {fbvElement type="button" class="pkp_button_link" id="previewButton" label="common.preview"} + {fbvElement type="submit" class="pkp_button_link" id="previewButton" label="common.preview"} {/fbvFormSection} From bd80a6363133e82b502fe23d26a45f9658867429 Mon Sep 17 00:00:00 2001 From: Jonas Raoni Soares da Silva Date: Mon, 16 Dec 2024 21:03:38 +0300 Subject: [PATCH 2/3] pkp/pkp-lib#10720 Fixed display of custom page menu --- .../NavigationMenuItemHandler.php | 59 ++++++++----------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/pages/navigationMenu/NavigationMenuItemHandler.php b/pages/navigationMenu/NavigationMenuItemHandler.php index cfc3d74e65d..eca21e4b628 100644 --- a/pages/navigationMenu/NavigationMenuItemHandler.php +++ b/pages/navigationMenu/NavigationMenuItemHandler.php @@ -27,12 +27,8 @@ class NavigationMenuItemHandler extends Handler { - /** @var NavigationMenuItem The nmi to view */ - public $nmi; - - public function __construct($nmi) + public function __construct(public ?NavigationMenuItem $nmi = null) { - $this->nmi = $nmi; } // @@ -57,7 +53,6 @@ public function authorize($request, &$args, $roleAssignments) */ public function preview($args, $request) { - $path = array_shift($args); $context = $request->getContext(); // Ensure that if we're previewing, the current user is a manager or admin. $roles = $this->getAuthorizedContextObject(Application::ASSOC_TYPE_USER_ROLES); @@ -77,8 +72,6 @@ public function preview($args, $request) app()->get('navigationMenu')->transformNavMenuItemTitle($templateMgr, $navigationMenuItem); - $templateMgr->assign('title', $navigationMenuItem->getLocalizedTitle()); - $vars = []; if ($context) { $vars = [ @@ -90,7 +83,10 @@ public function preview($args, $request) ]; } - $templateMgr->assign('content', strtr($navigationMenuItem->getLocalizedContent(), $vars)); + $templateMgr->assign([ + 'title' => $navigationMenuItem->getLocalizedTitle(), + 'content' => strtr($navigationMenuItem->getLocalizedContent(), $vars) + ]); $templateMgr->display('frontend/pages/navigationMenuItemViewContent.tpl'); } @@ -103,40 +99,31 @@ public function preview($args, $request) */ public function view($args, $request) { - $path = array_shift($args); - $context = $request->getContext(); - $contextId = \PKP\core\PKPApplication::SITE_CONTEXT_ID; - if ($context) { - $contextId = $context->getId(); + if (!isset($this->nmi)) { + return false; } // Assign the template vars needed and display $templateMgr = TemplateManager::getManager($request); $this->setupTemplate($request); - $navigationMenuItemDao = DAORegistry::getDAO('NavigationMenuItemDAO'); /** @var NavigationMenuItemDAO $navigationMenuItemDao */ - - $navigationMenuItem = $navigationMenuItemDao->getByPath($contextId, $path); - - if (isset($this->nmi)) { - $templateMgr->assign('title', $this->nmi->getLocalizedTitle()); - - $vars = []; - if ($context) { - $vars = [ - '{$contactName}' => $context->getData('contactName'), - '{$contactEmail}' => $context->getData('contactEmail'), - '{$supportName}' => $context->getData('supportName'), - '{$supportPhone}' => $context->getData('supportPhone'), - '{$supportEmail}' => $context->getData('supportEmail'), - ]; - } - $templateMgr->assign('content', strtr($this->nmi->getLocalizedContent(), $vars)); - - $templateMgr->display('frontend/pages/navigationMenuItemViewContent.tpl'); - } else { - return false; + $vars = []; + $context = $request->getContext(); + if ($context) { + $vars = [ + '{$contactName}' => $context->getData('contactName'), + '{$contactEmail}' => $context->getData('contactEmail'), + '{$supportName}' => $context->getData('supportName'), + '{$supportPhone}' => $context->getData('supportPhone'), + '{$supportEmail}' => $context->getData('supportEmail'), + ]; } + $templateMgr->assign([ + 'title' => $this->nmi->getLocalizedTitle(), + 'content' => strtr($this->nmi->getLocalizedContent(), $vars) + ]); + + $templateMgr->display('frontend/pages/navigationMenuItemViewContent.tpl'); } /** From 852f0e2fc537d5ca7d3a8565532487436519dab7 Mon Sep 17 00:00:00 2001 From: Jonas Raoni Soares da Silva Date: Tue, 17 Dec 2024 20:41:24 +0300 Subject: [PATCH 3/3] Revert "pkp/pkp-lib#10720 Fixed preview button" This reverts commit 34258f796314bd93c164b71364b08b79059168fd. --- templates/controllers/grid/navigationMenus/customNMIType.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/controllers/grid/navigationMenus/customNMIType.tpl b/templates/controllers/grid/navigationMenus/customNMIType.tpl index 9129728cc77..4b45f9e0c8c 100644 --- a/templates/controllers/grid/navigationMenus/customNMIType.tpl +++ b/templates/controllers/grid/navigationMenus/customNMIType.tpl @@ -22,7 +22,7 @@ {/fbvFormSection} {fbvFormSection class="formButtons"} - {fbvElement type="submit" class="pkp_button_link" id="previewButton" label="common.preview"} + {fbvElement type="button" class="pkp_button_link" id="previewButton" label="common.preview"} {/fbvFormSection}