Merge pull request #2632 from NateWr/i5525_category_nesting

pkp/pkp-lib#5525 Show category hierarchy when selecting categories
pkp · Feb 24, 2020 · 2f6f66e · 2f6f66e
2 parents 80c9c3a + 64b09a8
commit 2f6f66e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/classes/components/forms/publication/IssueEntryForm.inc.php b/classes/components/forms/publication/IssueEntryForm.inc.php
@@ -97,12 +97,15 @@ public function __construct($action, $locales, $publication, $publicationContext
 
 		// Categories
 		$categoryOptions = [];
-		$result = \DAORegistry::getDAO('CategoryDAO')->getByContextId($publicationContext->getId());
-		while (!$result->eof()) {
-			$category = $result->next();
+		$categories = \DAORegistry::getDAO('CategoryDAO')->getByContextId($publicationContext->getId())->toAssociativeArray();
+		foreach ($categories as $category) {
+			$label = $category->getLocalizedTitle();
+			if ($category->getParentId()) {
+				$label = $categories[$category->getParentId()]->getLocalizedTitle() . ' > ' . $label;
+			}
 			$categoryOptions[] = [
 				'value' => (int) $category->getId(),
-				'label' => $category->getLocalizedTitle(),
+				'label' => $label,
 			];
 		}
 		if (!empty($categoryOptions)) {

diff --git a/lib/pkp b/lib/pkp