From ddb4f685f95990bc7074fb576a23ce0707406228 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 21 Feb 2022 20:29:27 +0100
Subject: [PATCH] Some bugfixes for the category administration.

---
 .../ui/contentsections/CategoriesController.java  | 12 +++++++++---
 .../categorysystems/categorysystem.xhtml          | 15 +++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/CategoriesController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/CategoriesController.java
index 32a66c48e..9dfe35103 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/CategoriesController.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/CategoriesController.java
@@ -820,12 +820,18 @@ public class CategoriesController {
             category.setAbstractCategory(Objects.equals("true", isAbstract));
             categoryRepo.save(category);
 
+//            return String.format(
+//                "redirect:/%s/categorysystems/%s/categories/%s/%s",
+//                sectionIdentifier,
+//                context,
+//                categoryManager.getCategoryPath(category.getParentCategory()),
+//                categoryName
+//            );
             return String.format(
-                "redirect:/%s/categorysystems/%s/categories/%s/%s",
+                "redirect:/%s/categorysystems/%s/categories/%s",
                 sectionIdentifier,
                 context,
-                categoryManager.getCategoryPath(category.getParentCategory()),
-                categoryName
+                categoryManager.getCategoryPath(category)
             );
         } else {
             return result.getFailedResponseTemplate();
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/categorysystems/categorysystem.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/categorysystems/categorysystem.xhtml
index 0eb11b699..12227992b 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/categorysystems/categorysystem.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/categorysystems/categorysystem.xhtml
@@ -154,18 +154,21 @@
                                                                      pattern="[\\w-.]*"
                                                                      required="true"
                                                                      value="#{CategorySystemModel.selectedCategory.uniqueId}" />
-                                            <bootstrap:formCheck label="#{CmsAdminMessages['contentsecton.categorysystems.category.properties.edit.dialog.enabled.label']}"
+                                            <bootstrap:formCheck checked="#{CategorySystemModel.selectedCategory.enabled ? 'checked' : ''}"
+                                                                 label="#{CmsAdminMessages['contentsecton.categorysystems.category.properties.edit.dialog.enabled.label']}"
                                                                  inputId="isEnabled"
                                                                  name="isEnabled"
-                                                                 value="#{CategorySystemModel.selectedCategory.enabled}" />
-                                            <bootstrap:formCheck label="#{CmsAdminMessages['contentsecton.categorysystems.category.properties.edit.dialog.visible.label']}"
+                                                                 value="true" />
+                                            <bootstrap:formCheck checked="#{CategorySystemModel.selectedCategory.visible ? 'checked' : ''}"
+                                                                 label="#{CmsAdminMessages['contentsecton.categorysystems.category.properties.edit.dialog.visible.label']}"
                                                                  inputId="isvisible"
                                                                  name="isVisible"
-                                                                 value="#{CategorySystemModel.selectedCategory.visible}" />
-                                            <bootstrap:formCheck label="#{CmsAdminMessages['contentsecton.categorysystems.category.properties.edit.dialog.abstract_category.label']}"
+                                                                 value="true" />
+                                            <bootstrap:formCheck checked="#{CategorySystemModel.selectedCategory.abstractCategory ? 'checked' : ''}"
+                                                                 label="#{CmsAdminMessages['contentsecton.categorysystems.category.properties.edit.dialog.abstract_category.label']}"
                                                                  inputId="isAbstract"
                                                                  name="isAbstract"
-                                                                 value="#{CategorySystemModel.selectedCategory.abstractCategory}" />
+                                                                 value="true" />
                                         </div>
                                         <div class="modal-footer">
                                             <button class="btn btn-danger"