From 2f9bf4937ae93f95b00d6c528af9ca9483fa29b0 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Mon, 21 Oct 2024 00:44:01 +0800 Subject: [PATCH] pkp/pkp-lib#10444 Remove modalStyle param when using AjaxModal class --- controllers/grid/articleGalleys/ArticleGalleyGridHandler.php | 1 - controllers/grid/articleGalleys/ArticleGalleyGridRow.php | 1 - controllers/grid/issueGalleys/IssueGalleyGridHandler.php | 1 - controllers/grid/issueGalleys/IssueGalleyGridRow.php | 2 +- controllers/grid/issues/FutureIssueGridHandler.php | 1 - controllers/grid/issues/IssueGridCellProvider.php | 2 +- controllers/grid/issues/IssueGridRow.php | 3 +-- controllers/grid/settings/sections/SectionGridHandler.php | 1 - controllers/grid/settings/sections/SectionGridRow.php | 2 +- .../ExportPublishedSubmissionsListGridCellProvider.php | 1 - .../grid/subscriptions/SubscriptionTypesGridHandler.php | 2 +- controllers/grid/subscriptions/SubscriptionTypesGridRow.php | 2 +- controllers/grid/subscriptions/SubscriptionsGridHandler.php | 2 +- controllers/grid/subscriptions/SubscriptionsGridRow.php | 2 +- plugins/generic/announcementFeed/AnnouncementFeedPlugin.php | 1 - 15 files changed, 8 insertions(+), 16 deletions(-) diff --git a/controllers/grid/articleGalleys/ArticleGalleyGridHandler.php b/controllers/grid/articleGalleys/ArticleGalleyGridHandler.php index 56fb4e2c1cc..f6e0631350d 100644 --- a/controllers/grid/articleGalleys/ArticleGalleyGridHandler.php +++ b/controllers/grid/articleGalleys/ArticleGalleyGridHandler.php @@ -162,7 +162,6 @@ public function initialize($request, $args = null) new AjaxModal( $request->getRouter()->url($request, null, null, 'addGalley', null, $this->getRequestArgs()), __('submission.layout.newGalley'), - 'side-modal' ), __('grid.action.addGalley'), 'add_item' diff --git a/controllers/grid/articleGalleys/ArticleGalleyGridRow.php b/controllers/grid/articleGalleys/ArticleGalleyGridRow.php index df1396be5c3..8c393e72992 100644 --- a/controllers/grid/articleGalleys/ArticleGalleyGridRow.php +++ b/controllers/grid/articleGalleys/ArticleGalleyGridRow.php @@ -80,7 +80,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editGalley', null, $actionArgs), ($this->_isEditable) ? __('submission.layout.editGalley') : __('submission.layout.viewGalley'), - 'side-modal' ), ($this->_isEditable) ? __('grid.action.edit') : __('grid.action.view'), 'edit' diff --git a/controllers/grid/issueGalleys/IssueGalleyGridHandler.php b/controllers/grid/issueGalleys/IssueGalleyGridHandler.php index 5fee6d0d06f..a79e7180e50 100644 --- a/controllers/grid/issueGalleys/IssueGalleyGridHandler.php +++ b/controllers/grid/issueGalleys/IssueGalleyGridHandler.php @@ -138,7 +138,6 @@ public function initialize($request, $args = null) array_merge($this->getRequestArgs(), ['gridId' => $this->getId()]) ), __('grid.action.addIssueGalley'), - 'side-modal' ), __('grid.action.addIssueGalley'), 'add_category' diff --git a/controllers/grid/issueGalleys/IssueGalleyGridRow.php b/controllers/grid/issueGalleys/IssueGalleyGridRow.php index d494661cdae..585e406c453 100644 --- a/controllers/grid/issueGalleys/IssueGalleyGridRow.php +++ b/controllers/grid/issueGalleys/IssueGalleyGridRow.php @@ -71,7 +71,7 @@ public function initialize($request, $template = null) array_merge($this->getRequestArgs(), ['issueGalleyId' => $issueGalleyId]) ), __('editor.issues.editIssueGalley'), - 'side-modal', + null, true ), __('grid.action.edit'), diff --git a/controllers/grid/issues/FutureIssueGridHandler.php b/controllers/grid/issues/FutureIssueGridHandler.php index 878b06a4407..d4ec2cfec1e 100644 --- a/controllers/grid/issues/FutureIssueGridHandler.php +++ b/controllers/grid/issues/FutureIssueGridHandler.php @@ -46,7 +46,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addIssue', null, ['gridId' => $this->getId()]), __('grid.action.addIssue'), - 'side-modal' ), __('grid.action.addIssue'), 'add_category' diff --git a/controllers/grid/issues/IssueGridCellProvider.php b/controllers/grid/issues/IssueGridCellProvider.php index 36e2185ab53..52bb0c207cf 100644 --- a/controllers/grid/issues/IssueGridCellProvider.php +++ b/controllers/grid/issues/IssueGridCellProvider.php @@ -60,7 +60,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler: new AjaxModal( $router->url($request, null, null, 'editIssue', null, ['issueId' => $issue->getId()]), __('editor.issues.editIssue', ['issueIdentification' => htmlspecialchars($issue->getIssueIdentification())]), - 'side-modal', + null, true ), $issue->getIssueIdentification() diff --git a/controllers/grid/issues/IssueGridRow.php b/controllers/grid/issues/IssueGridRow.php index b74c52e273f..e4833b1cea8 100644 --- a/controllers/grid/issues/IssueGridRow.php +++ b/controllers/grid/issues/IssueGridRow.php @@ -52,7 +52,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editIssue', null, ['issueId' => $issueId]), __('editor.issues.editIssue', ['issueIdentification' => htmlspecialchars($issue->getIssueIdentification())]), - 'side-modal', + null, true ), __('grid.action.edit'), @@ -101,7 +101,6 @@ public function initialize($request, $template = null) ['issueId' => $issueId] ), __('editor.issues.publishIssue'), - 'primary' ), __('editor.issues.publishIssue'), 'advance' diff --git a/controllers/grid/settings/sections/SectionGridHandler.php b/controllers/grid/settings/sections/SectionGridHandler.php index 3d9f87af1d5..f4b6bfccbdd 100644 --- a/controllers/grid/settings/sections/SectionGridHandler.php +++ b/controllers/grid/settings/sections/SectionGridHandler.php @@ -105,7 +105,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addSection', null, ['gridId' => $this->getId()]), __('manager.sections.create'), - 'side-modal' ), __('manager.sections.create'), 'add_section' diff --git a/controllers/grid/settings/sections/SectionGridRow.php b/controllers/grid/settings/sections/SectionGridRow.php index 75202dcb02b..b28a76d1f72 100644 --- a/controllers/grid/settings/sections/SectionGridRow.php +++ b/controllers/grid/settings/sections/SectionGridRow.php @@ -46,7 +46,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editSection', null, ['sectionId' => $sectionId]), __('grid.action.edit'), - 'side-modal', + null, true ), __('grid.action.edit'), diff --git a/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php b/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php index 789c2b1ddaa..73d6d287a66 100644 --- a/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php +++ b/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php @@ -98,7 +98,6 @@ public function getCellActions($request, $row, $column, $position = GridHandler: new AjaxModal( $dispatcher->url($request, PKPApplication::ROUTE_COMPONENT, null, 'grid.issues.BackIssueGridHandler', 'editIssue', null, ['issueId' => $issue->getId()]), __('plugins.importexport.common.settings.DOIPluginSettings'), - 'side-modal' ), $issue->getIssueIdentification(), null diff --git a/controllers/grid/subscriptions/SubscriptionTypesGridHandler.php b/controllers/grid/subscriptions/SubscriptionTypesGridHandler.php index 6629b714f75..246a216fcb7 100644 --- a/controllers/grid/subscriptions/SubscriptionTypesGridHandler.php +++ b/controllers/grid/subscriptions/SubscriptionTypesGridHandler.php @@ -80,7 +80,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addSubscriptionType', null, null), __('manager.subscriptionTypes.create'), - 'side-modal', + null, true ), __('manager.subscriptionTypes.create'), diff --git a/controllers/grid/subscriptions/SubscriptionTypesGridRow.php b/controllers/grid/subscriptions/SubscriptionTypesGridRow.php index 24563b57891..9b4618d7437 100644 --- a/controllers/grid/subscriptions/SubscriptionTypesGridRow.php +++ b/controllers/grid/subscriptions/SubscriptionTypesGridRow.php @@ -57,7 +57,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editSubscriptionType', null, $actionArgs), __('manager.subscriptionTypes.edit'), - 'side-modal', + null, true ), __('common.edit'), diff --git a/controllers/grid/subscriptions/SubscriptionsGridHandler.php b/controllers/grid/subscriptions/SubscriptionsGridHandler.php index 8d43dfaecd7..3fd919b75a6 100644 --- a/controllers/grid/subscriptions/SubscriptionsGridHandler.php +++ b/controllers/grid/subscriptions/SubscriptionsGridHandler.php @@ -74,7 +74,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addSubscription', null, null), __('manager.subscriptions.create'), - 'side-modal', + null, true ), __('manager.subscriptions.create'), diff --git a/controllers/grid/subscriptions/SubscriptionsGridRow.php b/controllers/grid/subscriptions/SubscriptionsGridRow.php index 95588437ad7..5216c38209b 100644 --- a/controllers/grid/subscriptions/SubscriptionsGridRow.php +++ b/controllers/grid/subscriptions/SubscriptionsGridRow.php @@ -58,7 +58,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editSubscription', null, $actionArgs), __('manager.subscriptions.edit'), - 'side-modal', + null, true ), __('common.edit'), diff --git a/plugins/generic/announcementFeed/AnnouncementFeedPlugin.php b/plugins/generic/announcementFeed/AnnouncementFeedPlugin.php index 9c5de150624..3b1d41d776c 100644 --- a/plugins/generic/announcementFeed/AnnouncementFeedPlugin.php +++ b/plugins/generic/announcementFeed/AnnouncementFeedPlugin.php @@ -133,7 +133,6 @@ public function getActions($request, $verb) new AjaxModal( $router->url($request, null, null, 'manage', null, ['verb' => 'settings', 'plugin' => $this->getName(), 'category' => 'generic']), $this->getDisplayName(), - 'side-modal' ), __('manager.plugins.settings'), null