Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I10670 #4583

Merged
merged 2 commits into from
Jan 14, 2025
Merged

I10670 #4583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3779b1
pkp/pkp-ib#10670 Update urls for new dashboard and workflow page
jardakotesovec Jan 8, 2025
f097ee9
pkp/pkp-lib#10670 Update to new urls for dashboard and workflow page
jardakotesovec Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/payment/ojs/OJSPaymentManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function createQueuedPayment($request, $type, $userId, $assocId, $amount,
if ($submission->getData('submissionProgress')) {
$payment->setRequestUrl($dispatcher->url($request, Application::ROUTE_PAGE, null, 'submission', null, null, ['id' => $assocId]));
} else {
$payment->setRequestUrl($dispatcher->url($request, Application::ROUTE_PAGE, null, 'authorDashboard', 'submission', [$submission->getId()]));
$payment->setRequestUrl($dispatcher->url($request, Application::ROUTE_PAGE, null, 'dashboard', 'mySubmissions', null, ['workflowSubmissionId' => $submission->getId()]));
}
break;
case self::PAYMENT_TYPE_MEMBERSHIP: // Deprecated
Expand Down
2 changes: 1 addition & 1 deletion controllers/grid/toc/TocGridRow.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function initialize($request, $template = null)
new LinkAction(
'workflow',
new RedirectAction(
$dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'workflow', 'access', [$this->getId()])
$dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'dashboard', 'editorial', null, ['workflowSubmissionId' => $this->getId()])
),
__('submission.submission'),
'information'
Expand Down
1 change: 1 addition & 0 deletions pages/dashboard/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

switch ($op) {
case 'index':
return new APP\pages\dashboard\DashboardHandlerNext();
case 'editorial':
return new APP\pages\dashboard\DashboardHandlerNext(PKP\pages\dashboard\DashboardPage::EditorialDashboard);
case 'mySubmissions':
Expand Down
2 changes: 1 addition & 1 deletion plugins/reports/articles/ArticleReportPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public function display($args, $request)
'keywords' => join(', ', $keywords[Locale::getLocale()] ?? $keywords[$submission->getData('locale')] ?? []),
'agencies' => join(', ', $agencies[Locale::getLocale()] ?? $agencies[$submission->getData('locale')] ?? []),
'status' => $submission->getData('status') == PKPSubmission::STATUS_QUEUED ? $this->getStageLabel($submission->getData('stageId')) : __($statusMap[$submission->getData('status')]),
'url' => $request->url(null, 'workflow', 'access', $submission->getId()),
'url' => $request->url(null, 'dashboard', 'editorial', null, ['workflowSubmissionId' => $submission->getId()]),
'doi' => $publication->getDoi(),
'dateSubmitted' => $submission->getData('dateSubmitted'),
'lastModified' => $submission->getData('lastModified'),
Expand Down
2 changes: 1 addition & 1 deletion templates/frontend/objects/article_details.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
{* Indicate if this is only a preview *}
{if $publication->getData('status') !== PKP\submission\PKPSubmission::STATUS_PUBLISHED}
<div class="cmp_notification notice">
{capture assign="submissionUrl"}{url page="workflow" op="access" path=$article->getId()}{/capture}
{capture assign="submissionUrl"}{url page="dashboard" op="editorial" workflowSubmissionId=$article->getId()}{/capture}
{translate key="submission.viewingPreview" url=$submissionUrl}
</div>
{* Notification that this is an old version *}
Expand Down
Loading