Skip to content

Commit

Permalink
pkp/pkp-lib#10444 Add modalStyle when using RemoteActionConfirmationM…
Browse files Browse the repository at this point in the history
…odal modal
  • Loading branch information
blesildaramirez committed Oct 11, 2024
1 parent 5590db4 commit e08f46c
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion controllers/grid/catalogEntry/MarketsGridRow.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion controllers/grid/catalogEntry/PublicationDateGridRow.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion controllers/grid/catalogEntry/RepresentativesGridRow.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion controllers/grid/catalogEntry/SalesRightsGridRow.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 4 additions & 2 deletions controllers/grid/settings/series/SeriesGridCellProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler:
'activateSeries',
null,
['seriesKey' => $row->getId()]
)
),
'primary'
)
)];
} else {
Expand All @@ -87,7 +88,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler:
'deactivateSeries',
null,
['seriesKey' => $row->getId()]
)
),
'negative'
)
)];
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/grid/settings/series/SeriesGridRow.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion controllers/grid/users/chapter/ChapterGridCategoryRow.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 5 additions & 5 deletions plugins/pubIds/urn/URNPubIdPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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'),
Expand Down Expand Up @@ -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')]);
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion plugins/pubIds/urn/classes/form/URNSettingsForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit e08f46c

Please sign in to comment.