From d0341133b36734a8fd54306490bbc57d0d2b3ba4 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 12 Feb 2021 19:33:56 +0100 Subject: [PATCH] Mapped category systems overview Former-commit-id: 05725feb84de36f9124e0a36109bb70321edd655 --- .../contentsections/CategoriesController.java | 4 ++ .../categorysystems/categorysystems.xhtml | 51 +++++++++++++++++++ .../ui/contentsection/contentsection.xhtml | 6 ++- .../org/librecms/CmsAdminMessages.properties | 4 ++ .../librecms/CmsAdminMessages_de.properties | 4 ++ 5 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/categorysystems/categorysystems.xhtml 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 255741366..45aa38a6e 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 @@ -57,6 +57,9 @@ public class CategoriesController { @Inject private CategorySystemModel categorySystemModel; + @Inject + private ContentSectionModel sectionModel; + @Inject private ContentSectionRepository sectionRepo; @@ -83,6 +86,7 @@ public class CategoriesController { return "org/librecms/ui/contentsection/contentsection-not-found.xhtml"; } final ContentSection section = sectionResult.get(); + sectionModel.setSection(section); final List domains = section .getDomains() diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/categorysystems/categorysystems.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/categorysystems/categorysystems.xhtml new file mode 100644 index 000000000..fa3cb246e --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/categorysystems/categorysystems.xhtml @@ -0,0 +1,51 @@ +]> + + + + + + + +
  • + #{CmsAdminMessages['contentsection.categories.title']} +
    • +     + + +
    +

    #{CmsAdminMessages.getMessage("contentsection.categories.heading", [ContentSectionModel.sectionName])}

    + + + + + + + + + + + + + + + + + + +
    + #{CmsAdminMessages['contentsection.categories.categorysystems.list.heading.context']} + + #{CmsAdminMessages['contentsection.categories.categorysystems.list.heading.domainKey']} + + #{CmsAdminMessages['contentsection.categories.categorysystems.list.heading.title']} +
    #{categorySystem.context}#{categorySystem.domainKey}#{categorySystem.title}
    +
    +     +     + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml index 526caa5a9..ba50846cc 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/contentsection.xhtml @@ -40,7 +40,7 @@
  • - #{CmsAdminMessages['contentsection.categories.title']} @@ -64,7 +64,9 @@
  • - #{ContentSectionModel.sectionName} + + #{ContentSectionModel.sectionName} +
    • diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties index 30c20ee72..c2d1c2e2d 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties @@ -141,3 +141,7 @@ asset_permissions.delete_assets=Delete asset_permissions.use_asset=Use asset_permissions.edit_asset=Edit asset_permissions.view_asset=View +contentsection.categories.categorysystems.list.heading.context=Context +contentsection.categories.categorysystems.list.heading.domainKey=Domain Key +contentsection.categories.categorysystems.list.heading.title=Category System Title +contentsection.categories.heading=Category Systems mapped to Content Section {0} diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties index d639150f8..84ef44201 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties @@ -141,3 +141,7 @@ asset_permissions.delete_assets=L\u00f6schen asset_permissions.use_asset=Asset asset_permissions.edit_asset=Bearbeiten asset_permissions.view_asset=Betrachten +contentsection.categories.categorysystems.list.heading.context=Kontext +contentsection.categories.categorysystems.list.heading.domainKey=Domain Key +contentsection.categories.categorysystems.list.heading.title=Titel des Kategoriensystems +contentsection.categories.heading=Mit Content Section {0} verbundene Kategoriensysteme