From 27db2f3d823eb26253b9edb99a3210a4df88edf0 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 11 Oct 2024 19:36:20 +0800 Subject: [PATCH] pkp/pkp-lib#10444 Add modalStyle when using RemoteActionConfirmationModal modal --- .../grid/catalogEntry/IdentificationCodeGridRow.php | 2 +- controllers/grid/catalogEntry/MarketsGridRow.php | 2 +- .../grid/catalogEntry/PublicationDateGridRow.php | 2 +- .../catalogEntry/PublicationFormatGridCategoryRow.php | 2 +- .../catalogEntry/PublicationFormatGridCellProvider.php | 2 +- .../grid/catalogEntry/RepresentativesGridRow.php | 2 +- controllers/grid/catalogEntry/SalesRightsGridRow.php | 2 +- .../grid/settings/series/SeriesGridCellProvider.php | 6 ++++-- controllers/grid/settings/series/SeriesGridRow.php | 2 +- .../grid/users/chapter/ChapterGridCategoryRow.php | 2 +- plugins/pubIds/urn/URNPubIdPlugin.php | 10 +++++----- plugins/pubIds/urn/classes/form/URNSettingsForm.php | 2 +- 12 files changed, 19 insertions(+), 17 deletions(-) diff --git a/controllers/grid/catalogEntry/IdentificationCodeGridRow.php b/controllers/grid/catalogEntry/IdentificationCodeGridRow.php index d37f39815df..955d909d8f2 100644 --- a/controllers/grid/catalogEntry/IdentificationCodeGridRow.php +++ b/controllers/grid/catalogEntry/IdentificationCodeGridRow.php @@ -88,7 +88,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteCode', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/catalogEntry/MarketsGridRow.php b/controllers/grid/catalogEntry/MarketsGridRow.php index 98ce450daac..2a8f102f991 100644 --- a/controllers/grid/catalogEntry/MarketsGridRow.php +++ b/controllers/grid/catalogEntry/MarketsGridRow.php @@ -89,7 +89,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteMarket', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/catalogEntry/PublicationDateGridRow.php b/controllers/grid/catalogEntry/PublicationDateGridRow.php index 00ed32ad6cd..09e1e4d145e 100644 --- a/controllers/grid/catalogEntry/PublicationDateGridRow.php +++ b/controllers/grid/catalogEntry/PublicationDateGridRow.php @@ -91,7 +91,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteDate', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/catalogEntry/PublicationFormatGridCategoryRow.php b/controllers/grid/catalogEntry/PublicationFormatGridCategoryRow.php index 2869128e65d..0c6fd0b2064 100644 --- a/controllers/grid/catalogEntry/PublicationFormatGridCategoryRow.php +++ b/controllers/grid/catalogEntry/PublicationFormatGridCategoryRow.php @@ -112,7 +112,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteFormat', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/catalogEntry/PublicationFormatGridCellProvider.php b/controllers/grid/catalogEntry/PublicationFormatGridCellProvider.php index 17dc96428ec..3110b024b1f 100644 --- a/controllers/grid/catalogEntry/PublicationFormatGridCellProvider.php +++ b/controllers/grid/catalogEntry/PublicationFormatGridCellProvider.php @@ -172,7 +172,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'publicationId' => $data->getData('publicationId'), ] ), - 'modal_approve' + $data->getIsAvailable() ? 'negative' : 'primary' ), $data->getIsAvailable() ? __('grid.catalogEntry.isAvailable') : __('grid.catalogEntry.isNotAvailable'), $data->getIsAvailable() ? 'complete' : 'incomplete', diff --git a/controllers/grid/catalogEntry/RepresentativesGridRow.php b/controllers/grid/catalogEntry/RepresentativesGridRow.php index 9ec80e6c965..85617e9cbee 100644 --- a/controllers/grid/catalogEntry/RepresentativesGridRow.php +++ b/controllers/grid/catalogEntry/RepresentativesGridRow.php @@ -83,7 +83,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteRepresentative', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/catalogEntry/SalesRightsGridRow.php b/controllers/grid/catalogEntry/SalesRightsGridRow.php index c661bfb317a..024aa03f669 100644 --- a/controllers/grid/catalogEntry/SalesRightsGridRow.php +++ b/controllers/grid/catalogEntry/SalesRightsGridRow.php @@ -83,7 +83,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteRights', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/settings/series/SeriesGridCellProvider.php b/controllers/grid/settings/series/SeriesGridCellProvider.php index 03fc952e4c6..8c343bfe144 100644 --- a/controllers/grid/settings/series/SeriesGridCellProvider.php +++ b/controllers/grid/settings/series/SeriesGridCellProvider.php @@ -70,7 +70,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'activateSeries', null, ['seriesKey' => $row->getId()] - ) + ), + 'primary' ) )]; } else { @@ -87,7 +88,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'deactivateSeries', null, ['seriesKey' => $row->getId()] - ) + ), + 'negative' ) )]; } diff --git a/controllers/grid/settings/series/SeriesGridRow.php b/controllers/grid/settings/series/SeriesGridRow.php index 776697dc9d1..d228b7ae83b 100644 --- a/controllers/grid/settings/series/SeriesGridRow.php +++ b/controllers/grid/settings/series/SeriesGridRow.php @@ -62,7 +62,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('grid.action.delete'), $router->url($request, null, null, 'deleteSeries', null, ['seriesId' => $seriesId]), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/users/chapter/ChapterGridCategoryRow.php b/controllers/grid/users/chapter/ChapterGridCategoryRow.php index 89e3321d9b4..c1e75860b51 100644 --- a/controllers/grid/users/chapter/ChapterGridCategoryRow.php +++ b/controllers/grid/users/chapter/ChapterGridCategoryRow.php @@ -87,7 +87,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteChapter', null, $actionArgs), - 'modal_delete' + 'negative' ), __('common.delete'), 'delete' diff --git a/plugins/pubIds/urn/URNPubIdPlugin.php b/plugins/pubIds/urn/URNPubIdPlugin.php index 6135d54106b..ea353855528 100644 --- a/plugins/pubIds/urn/URNPubIdPlugin.php +++ b/plugins/pubIds/urn/URNPubIdPlugin.php @@ -213,7 +213,7 @@ public function getLinkActions($pubObject) __('plugins.pubIds.urn.editor.clearObjectsURN.confirm'), __('common.delete'), $request->url(null, null, 'clearPubId', null, $userVars), - 'modal_delete' + 'negative' ), __('plugins.pubIds.urn.editor.clearObjectsURN'), 'delete', @@ -351,8 +351,8 @@ public function addPublicationFormFields(string $hookName, FormComponent $form): } $form->addField(new FieldPubIdUrn('pub-id::other::urn', $fieldData)); - // Otherwise add a field for manual entry that includes a button to generate - // the check number + // Otherwise add a field for manual entry that includes a button to generate + // the check number } else { $form->addField(new FieldTextUrn('pub-id::other::urn', [ 'label' => __('plugins.pubIds.urn.displayName'), @@ -383,7 +383,7 @@ public function addPublishFormNotice(string $hookName, FormComponent $form): voi if (!$publicationUrnEnabled && !$chapterUrnEnabled && !$publicationFormatUrnEnabled && !$submissionFileUrnEnabled) { return; - // Use a simplified view when only assigning to the publication + // Use a simplified view when only assigning to the publication } elseif ($publicationFormatUrnEnabled && !$chapterUrnEnabled && !$publicationFormatUrnEnabled && !$submissionFileUrnEnabled) { if ($form->publication->getData('pub-id::other::urn')) { $msg = __('plugins.pubIds.urn.editor.preview.publication', ['urn' => $form->publication->getData('pub-id::other::urn')]); @@ -396,7 +396,7 @@ public function addPublishFormNotice(string $hookName, FormComponent $form): voi ])); return; - // Show a table if probably more than one URN is going to be created + // Show a table if probably more than one URN is going to be created } else { $urnTableRows = []; if ($publicationUrnEnabled) { diff --git a/plugins/pubIds/urn/classes/form/URNSettingsForm.php b/plugins/pubIds/urn/classes/form/URNSettingsForm.php index 0e9b3b92b2a..4ae8452868f 100644 --- a/plugins/pubIds/urn/classes/form/URNSettingsForm.php +++ b/plugins/pubIds/urn/classes/form/URNSettingsForm.php @@ -108,7 +108,7 @@ public function __construct($plugin, int $contextId) __('plugins.pubIds.urn.manager.settings.urnReassign.confirm'), __('common.delete'), $request->url(null, null, 'manage', null, ['verb' => 'clearPubIds', 'plugin' => $plugin->getName(), 'category' => 'pubIds']), - 'modal_delete' + 'negative' ), __('plugins.pubIds.urn.manager.settings.urnReassign'), 'delete'