From cb0461aadc794b1751184f691682466f74eeb8b7 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 11 Nov 2020 19:01:03 +0100
Subject: [PATCH] Edit form for Category Systems

Former-commit-id: edc1de573ce71d8b63e26e08fd8980c157ecad74
---
 .../categories/CategorySystemDetailsModel.java |  4 ++++
 .../categories/categorysystem-details.xhtml    | 18 +++++++++++++++---
 .../admin/categories/categorysystem-form.xhtml |  9 ++++++---
 .../org/libreccm/ui/AdminBundle.properties     |  1 +
 .../org/libreccm/ui/AdminBundle_de.properties  |  1 +
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index cdca584c8..1f26274ba 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -64,6 +64,10 @@ public class CategorySystemDetailsModel {
     public long getCategorySystemId() {
         return categorySystemId;
     }
+    
+    public String getIdentifier() {
+        return String.format("ID-%d", categorySystemId);
+    }
 
     public String getUuid() {
         return uuid;
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 210e8e6c1..7746d35c7 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -22,7 +22,7 @@
 
         <ui:define name="main">
             <div class="container">
-                <h1>#{AdminMessages.getMessage('categorysystems.details.title', [CategorySystemsDetailsModel.domainKey])}</h1>
+                <h1>#{AdminMessages.getMessage('categorysystems.details.title', [CategorySystemDetailsModel.domainKey])}</h1>
 
                 <dl>
                     <div>
@@ -58,6 +58,18 @@
                         </dd>
                     </div>
                 </dl>
+                <div class="mb-4">
+                    <a class="btn btn-primary"
+                       href="#{mvc.uri('CategorySystemsController#editCategorySystem', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier } )}">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                        </svg>
+                        <span>#{AdminMessages['categorysystems.details.edit']}</span>
+                    </a>
+                </div>
 
                 <h2>
                     #{AdminMessages['categorysystems.details.title.heading']}
@@ -103,7 +115,7 @@
                                             #{entry.value}
                                         </td>
                                         <td>
-                                            <button class="btn btn-primary"
+                                            <button class="btn btn-info"
                                                     type="button">
                                                 <svg class="bi"
                                                      width="1em"
@@ -178,7 +190,7 @@
                                             #{entry.value}
                                         </td>
                                         <td>
-                                            <button class="btn btn-primary"
+                                            <button class="btn btn-info"
                                                     type="button">
                                                 <svg class="bi"
                                                      width="1em"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
index 39fb0593a..f8a6b68de 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
@@ -34,7 +34,7 @@
 
         <ui:define name="main">
             <div class="container">
-                <h1>#{CategorySystemDetailsModel.new ? AdminMessages['categorysystems.new.label'] : AdminMessages.getMessage('categorysystems.edit.label', CategorySystemDetailsModel.domainKey)}</h1>
+                <h1>#{CategorySystemDetailsModel.new ? AdminMessages['categorysystems.new.label'] : AdminMessages.getMessage('categorysystems.edit.label', [CategorySystemDetailsModel.domainKey])}</h1>
 
                 <form action="#{CategorySystemDetailsModel.new ? mvc.uri('CategorySystemFormController#createCategorySystem') : mvc.uri('CategorySystemFormController#updateCategorySystem', {'categorySystemIdentifier': CategoryDetailsModel.domainKey })}"
                       method="post">
@@ -45,7 +45,8 @@
                         <input aria-describedby="domainKey-help"
                                class="form-control"
                                name="domainKey"
-                               type="text" />
+                               type="text" 
+                               value="#{CategorySystemDetailsModel.domainKey}" />
                         <small class="form-text text-muted"
                                id="domainKey-help">
                             #{AdminMessages['categorysystems.form.domainKey.help']}
@@ -58,7 +59,9 @@
                         <input aria-describedby="uri-help"
                                class="form-control"
                                name="domainKey"
-                               type="text" />
+                               type="text" 
+                               value="#{CategorySystemDetailsModel.uri}"
+                               />
                         <small class="form-text text-muted"
                                id="domainKey-help">
                             #{AdminMessages['categorysystems.form.uri.help']}
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 09aa7f369..049be487c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -286,3 +286,4 @@ categorysystems.details.owners.remove=Remove
 categorysystems.details.owners.context=Context
 categorysystems.details.owners.heading=Used by
 categorysystems.details.owners.none=Not in use by any application
+categorysystems.details.edit=Edit
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 8dad8b0d8..31d6fb457 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -286,3 +286,4 @@ categorysystems.details.owners.remove=Entfernen
 categorysystems.details.owners.context=Context
 categorysystems.details.owners.heading=Verwendet von
 categorysystems.details.owners.none=Wird von keiner Anwendung verwendet
+categorysystems.details.edit=Bearbeiten