From 23158e2bbf1f55a2ff7923c0abfce3b06c7371ae Mon Sep 17 00:00:00 2001 From: Jerry Kuang Date: Fri, 25 Sep 2026 17:32:29 +0000 Subject: [PATCH 1/2] [PURR][#2812]Display the Review tab and progress notice to user in publication submission process --- .../language/en-GB/en-GB.plg_projects_publications.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/core/plugins/projects/publications/language/en-GB/en-GB.plg_projects_publications.ini b/core/plugins/projects/publications/language/en-GB/en-GB.plg_projects_publications.ini index 1fe80d0c4c3..2eaed0c2031 100644 --- a/core/plugins/projects/publications/language/en-GB/en-GB.plg_projects_publications.ini +++ b/core/plugins/projects/publications/language/en-GB/en-GB.plg_projects_publications.ini @@ -1044,6 +1044,7 @@ PLG_PROJECTS_PUBLICATIONS_DRAFT_READY_TO_SUBMIT="OK to submit" PLG_PROJECTS_PUBLICATIONS_ERROR_REGISTER_METADATA="Error registering the DOI metadata and issuing DOI." PLG_PROJECTS_PUBLICATIONS_ERROR_REGISTER_NAME_URL="Error registering the DOI name and dataset URL." PLG_PROJECTS_PUBLICATIONS_ERROR_UPDATE_DOI="Failed to update DOI." +PLG_PROJECTS_PUBLICATIONS_PROGRESS_NOTICE="Your dataset is not yet submitted! When you have filled each required field, open the Review tab, then click "Submit draft" to send your dataset to an administrator." ; Misc PLG_PROJECTS_PUBLICATIONS_REQUIRED="required" From 98a484c8384b614fd840991c7484f331de7b9a38 Mon Sep 17 00:00:00 2001 From: "Nicholas J. Kisseberth" Date: Wed, 7 Oct 2026 15:05:30 -0400 Subject: [PATCH 2/2] Publications draft: always list the Review tab, and say how to finish Rework of the previous commit, which added only a language string while the behaviour it describes lived in a PURR template copy of the draft status bar. The behaviour is generic and belongs in core: - The status bar listed the Review tab only while on it, so a submitter who filled in every section had no visible way to the submit button and stalled. Drop that guard. The Review page itself still offers the button only once curation reports the draft complete, and the submit task re-checks, so an early visit cannot submit an incomplete draft. - Under the status bar, a draft that has not been submitted says so and how to finish, with a separate string for a draft a curator sent back (whose button reads "Re-submit draft to be published"), and nothing on the Review step where the button is. Generic wording in core; a hub that calls its publications something else overrides the two strings. - The string the earlier commit put in the Errors section, with unescaped quotes and PURR wording, is replaced by the two above in the draft-flow section. --- .../publications/assets/css/publications.css | 6 ++++++ .../en-GB/en-GB.plg_projects_publications.ini | 3 ++- .../publications/views/draft/tmpl/statusbar.php | 14 ++++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/core/plugins/projects/publications/assets/css/publications.css b/core/plugins/projects/publications/assets/css/publications.css index 61b7512569e..498d53ad410 100644 --- a/core/plugins/projects/publications/assets/css/publications.css +++ b/core/plugins/projects/publications/assets/css/publications.css @@ -1959,3 +1959,9 @@ min-width: 800px; } } + +/* Draft progress notice under the status bar */ + .progress-notice { + clear: both; + margin: 0.5em 0 1em 0; + } diff --git a/core/plugins/projects/publications/language/en-GB/en-GB.plg_projects_publications.ini b/core/plugins/projects/publications/language/en-GB/en-GB.plg_projects_publications.ini index 2eaed0c2031..ae580715d87 100644 --- a/core/plugins/projects/publications/language/en-GB/en-GB.plg_projects_publications.ini +++ b/core/plugins/projects/publications/language/en-GB/en-GB.plg_projects_publications.ini @@ -1041,10 +1041,11 @@ COM_PUBLICATIONS_ERROR_DOI_NO_SERVICE="The DOI service is either unavailable or PLG_PROJECTS_PUBLICATIONS_PROJECT_MANAGER="Project manager" PLG_PROJECTS_PUBLICATIONS_PROJECT_MEMBER="Project member" PLG_PROJECTS_PUBLICATIONS_DRAFT_READY_TO_SUBMIT="OK to submit" +PLG_PROJECTS_PUBLICATIONS_PROGRESS_NOTICE="This publication has not been submitted yet. When every required field is filled in, open the Review tab and click \"Submit draft\"." +PLG_PROJECTS_PUBLICATIONS_PROGRESS_NOTICE_RESUBMIT="This publication has not been re-submitted yet. When the requested changes are made, open the Review tab and click \"Re-submit draft to be published\"." PLG_PROJECTS_PUBLICATIONS_ERROR_REGISTER_METADATA="Error registering the DOI metadata and issuing DOI." PLG_PROJECTS_PUBLICATIONS_ERROR_REGISTER_NAME_URL="Error registering the DOI name and dataset URL." PLG_PROJECTS_PUBLICATIONS_ERROR_UPDATE_DOI="Failed to update DOI." -PLG_PROJECTS_PUBLICATIONS_PROGRESS_NOTICE="Your dataset is not yet submitted! When you have filled each required field, open the Review tab, then click "Submit draft" to send your dataset to an administrator." ; Misc PLG_PROJECTS_PUBLICATIONS_REQUIRED="required" diff --git a/core/plugins/projects/publications/views/draft/tmpl/statusbar.php b/core/plugins/projects/publications/views/draft/tmpl/statusbar.php index 93be9d565fd..8500a9adb7a 100644 --- a/core/plugins/projects/publications/views/draft/tmpl/statusbar.php +++ b/core/plugins/projects/publications/views/draft/tmpl/statusbar.php @@ -69,15 +69,17 @@ $class = ''; } $i++; - - // Hide review block until in review - if ($blockname == 'review' && ($blockId != $activenum)) - { - continue; - } ?> > >manifest->label; ?> + pub->state, array(\Components\Publications\Models\Publication::STATE_DRAFT, \Components\Publications\Models\Publication::STATE_WORKED)) && $active != 'review') { ?> +

pub->isWorked() ? 'PLG_PROJECTS_PUBLICATIONS_PROGRESS_NOTICE_RESUBMIT' : 'PLG_PROJECTS_PUBLICATIONS_PROGRESS_NOTICE'); ?>

+