Merge pull request #10295 from taslangraham/i6055-stable-3_3_0

#6055 Bug fix: address missing category selection after failed submission form validation
pkp · Aug 14, 2024 · 43d7555 · 43d7555
2 parents fac232c + a56d3aa
commit 43d7555
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/classes/submission/form/PKPSubmissionSubmitStep1Form.inc.php b/classes/submission/form/PKPSubmissionSubmitStep1Form.inc.php
@@ -173,7 +173,8 @@ function fetch($request, $template = null, $display = false) {
 		}
 		$templateMgr->assign(array(
 			'assignedCategories' => $assignedCategories,
-			'categories' => $items,
+			'categoryOptions' => $items,
+			'categories' => (array) $request->getUserVar('categories'),
 		));
 
 		return parent::fetch($request, $template, $display);

diff --git a/templates/submission/form/categories.tpl b/templates/submission/form/categories.tpl
@@ -7,19 +7,19 @@
  *
  * Include categories for submissions.
  *}
-{if $categories && is_array($categories) && count($categories)}
+{if is_array($categoryOptions) && !empty($categoryOptions)}
 	{if $readOnly}
 		{fbvFormSection title="grid.category.categories" list=true}
-			{foreach from=$categories item="category" key="id"}
+			{foreach from=$categoryOptions item="category" key="id"}
 				{if in_array($id, $assignedCategories)}
 					<li>{$category->getLocalizedTitle()|escape}</li>
 				{/if}
 			{/foreach}
 		{/fbvFormSection}
 	{else}
 		{fbvFormSection list=true title="grid.category.categories"}
-			{foreach from=$categories item="category" key="id"}
-				{fbvElement type="checkbox" id="categories[]" value=$id checked=in_array($id, $assignedCategories) label=$category|escape translate=false}
+			{foreach from=$categoryOptions item="category" key="id"}
+				{fbvElement type="checkbox" id="categories[]" value=$id checked=in_array($id, $categories) label=$category|escape translate=false}
 			{/foreach}
 		{/fbvFormSection}
 	{/if}