From 39e0d4a5beb85a54145c07776b2f44ef4752cf68 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Wed, 13 Jul 2022 21:15:54 +0200
Subject: [PATCH] Some bugfixes

---
 .../contenttypes/PublicationAbstractStep.java   | 11 ++++++-----
 .../PublicationAbstractStepResources.java       |  2 +-
 .../ui/contenttypes/PublicationMiscStep.java    | 17 ++++++++++++-----
 .../PublicationMiscStepResources.java           |  2 +-
 .../contenttypes/ui/abstract.xhtml              |  2 +-
 .../contenttypes/ui/abstract/edit.xhtml         |  4 ++--
 .../contenttypes/ui/abstract/view.xhtml         |  5 +++--
 .../scientificcms/contenttypes/ui/misc.xhtml    | 10 +++++-----
 .../contenttypes/ui/misc/edit.xhtml             | 10 +++++-----
 .../contenttypes/ui/misc/view.xhtml             | 17 +++++++++--------
 10 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStep.java
index 1840086..f0ed394 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStep.java
@@ -12,8 +12,9 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
 import org.librecms.ui.contentsections.documents.MvcAuthoringSteps;
 import org.scientificcms.publications.Publication;
 import org.scientificcms.publications.PublicationRepository;
-import org.scientificcms.publications.SciPublicationsConstants;
+import org.scientificcms.publications.contenttypes.MonographItem;
 import org.scientificcms.publications.contenttypes.PublicationItem;
+import org.scientificcms.publications.ui.SciPublicationsUiConstants;
 import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
 
 import java.util.Locale;
@@ -38,7 +39,7 @@ import javax.ws.rs.PathParam;
 @Path(MvcAuthoringSteps.PATH_PREFIX + "publication-abstract")
 @Controller
 @MvcAuthoringStepDef(
-    bundle = SciPublicationsConstants.BUNDLE,
+    bundle = SciPublicationsUiConstants.BUNDLE,
     descriptionKey = "authoringsteps.abstract.description",
     labelKey = "authoringsteps.abstract.label",
     supportedDocumentType = PublicationItem.class
@@ -87,7 +88,7 @@ public class PublicationAbstractStep extends AbstractMvcAuthoringStep {
         }
 
         if (itemPermissionChecker.canEditItem(getPublicationItem())) {
-            return "/org/scientificcms/contenttypes/publications/ui/publication/abstract.xhtml";
+            return "org/scientificcms/contenttypes/ui/abstract.xhtml";
         } else {
             return documentUi.showAccessDenied(
                 getContentSection(),
@@ -129,7 +130,7 @@ public class PublicationAbstractStep extends AbstractMvcAuthoringStep {
                 new Locale(localeParam).toString()
             );
 
-            return "/org/scientificcms/contenttypes/publications/ui/publication/abstract/view.xhtml";
+            return "org/scientificcms/contenttypes/ui/abstract/view.xhtml";
         } else {
             return documentUi.showAccessDenied(
                 getContentSection(),
@@ -207,7 +208,7 @@ public class PublicationAbstractStep extends AbstractMvcAuthoringStep {
                 new Locale(localeParam).toString()
             );
 
-            return "/org/scientificcms/contenttypes/publications/ui/publication/abstract/edit.xhtml";
+            return "org/scientificcms/contenttypes/ui/abstract/edit.xhtml";
         } else {
             return documentUi.showAccessDenied(
                 getContentSection(),
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStepResources.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStepResources.java
index d333cc8..6b998d6 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStepResources.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStepResources.java
@@ -87,7 +87,7 @@ public class PublicationAbstractStepResources {
     }
 
     @GET
-    @Path("/variants/{locale}")
+    @Path("/{locale}")
     @Produces(MediaType.TEXT_HTML)
     @Transactional(Transactional.TxType.REQUIRED)
     public String viewAbstractValue(
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStep.java
index 923b603..400ca59 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStep.java
@@ -12,8 +12,8 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
 import org.librecms.ui.contentsections.documents.MvcAuthoringSteps;
 import org.scientificcms.publications.Publication;
 import org.scientificcms.publications.PublicationRepository;
-import org.scientificcms.publications.SciPublicationsConstants;
 import org.scientificcms.publications.contenttypes.PublicationItem;
+import org.scientificcms.publications.ui.SciPublicationsUiConstants;
 import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
 
 import java.util.Locale;
@@ -38,7 +38,7 @@ import javax.ws.rs.PathParam;
 @Path(MvcAuthoringSteps.PATH_PREFIX + "publication-misc")
 @Controller
 @MvcAuthoringStepDef(
-    bundle = SciPublicationsConstants.BUNDLE,
+    bundle = SciPublicationsUiConstants.BUNDLE,
     descriptionKey = "authoringsteps.misc.description",
     labelKey = "authoringsteps.misc.label",
     supportedDocumentType = PublicationItem.class
@@ -87,7 +87,7 @@ public class PublicationMiscStep extends AbstractMvcAuthoringStep {
         }
 
         if (itemPermissionChecker.canEditItem(getPublicationItem())) {
-            return "/org/scientificcms/contenttypes/publications/ui/publication/misc.xhtml";
+            return "org/scientificcms/contenttypes/ui/misc.xhtml";
         } else {
             return documentUi.showAccessDenied(
                 getContentSection(),
@@ -129,7 +129,7 @@ public class PublicationMiscStep extends AbstractMvcAuthoringStep {
                 new Locale(localeParam).toString()
             );
 
-            return "/org/scientificcms/contenttypes/publications/ui/publication/misc/view.xhtml";
+            return "org/scientificcms/contenttypes/ui/misc/view.xhtml";
         } else {
             return documentUi.showAccessDenied(
                 getContentSection(),
@@ -204,7 +204,7 @@ public class PublicationMiscStep extends AbstractMvcAuthoringStep {
         if (itemPermissionChecker.canEditItem(getPublicationItem())) {
             miscStepModel.setSelectedLocale(new Locale(localeParam).toString());
 
-            return "/org/scientificcms/contenttypes/publications/ui/publication/misc/edit.xhtml";
+            return "org/scientificcms/contenttypes/ui/misc/edit.xhtml";
         } else {
             return documentUi.showAccessDenied(
                 getContentSection(),
@@ -294,6 +294,13 @@ public class PublicationMiscStep extends AbstractMvcAuthoringStep {
         );
         if (canEdit) {
             miscStepModel.setCanEdit(canEdit);
+            miscStepModel.setPublicationTitle(
+                globalizationHelper
+                    .getValueFromLocalizedString(
+                        getPublication().getTitle()
+                    )
+            );
+
             miscStepModel.setMiscValues(
                 getPublication()
                     .getMisc()
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStepResources.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStepResources.java
index 0812041..f161e61 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStepResources.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStepResources.java
@@ -86,7 +86,7 @@ public class PublicationMiscStepResources {
     }
 
     @GET
-    @Path("/variants/{locale}")
+    @Path("/{locale}")
     @Produces(MediaType.TEXT_HTML)
     @Transactional(Transactional.TxType.REQUIRED)
     public String viewTextValue(
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract.xhtml
index befedcf..7c5424a 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract.xhtml
@@ -9,7 +9,7 @@
 
         <ui:define name="authoringStep">
 
-            <h2>#{SciPublicationsUiMessageBundle.getMessage('editsteps.abstract.header', SciCmsPublicationAbstractStepModel.publicationTitle)}</h2>
+            <h2>#{SciPublicationsUiMessageBundle.getMessage('editsteps.abstract.header', [SciCmsPublicationAbstractStepModel.publicationTitle])}</h2>
             
             <librecms:cmsEditorVariants
                 addButtonLabel="#{SciPublicationsUiMessageBundle['editsteps.abstract.editor.add_variant']}"
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/edit.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/edit.xhtml
index 39011cb..0bf6661 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/edit.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/edit.xhtml
@@ -10,7 +10,7 @@
         <ui:define name="authoringStep">
             <div class="d-flex">
                 <a class="btn btn-secondary btn-sm align-self-center mr-2"
-                   href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/docuemnts/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract">
+                   href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract">
                     <bootstrap:svgIcon icon="caret-left-fill" />
                     <span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.abstract.step_back']}</span>
                 </a>
@@ -20,7 +20,7 @@
 
             <c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}">
                 <librecms:cmsEditor
-                    backUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/docuemnts/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract"
+                    backUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract"
                     baseUrl="#{mvc.basePath}"
                     canEdit="#{SciCmsPublicationAbstractStepModel.canEdit}"
                     contentSection="#{ContentSectionModel.sectionName}"
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/view.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/view.xhtml
index 9cc83ea..a89ceb0 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/view.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/view.xhtml
@@ -23,7 +23,7 @@
             <c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}">
                 <div class="text-right">
                     <a class="btn btn-secondary"
-                       href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract/abstract/edit">
+                       href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract/abstract/edit/#{SciCmsPublicationAbstractStepModel.selectedLocale}">
                         <bootstrap:svgIcon icon="pen" />
                         <span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.abstract.edit']}</span>
                     </a>
@@ -32,7 +32,8 @@
             
             <div class="cms-text-preview article-text border p-2">
                 <h:outputText escape="false"
-                              value="#{SciCmsPublicationAbstractStepModel.abstractValues.get(SciCmsPublicationAbstractStepModel.selectedLocale)}"
+                              value="#{SciCmsPublicationAbstractStepModel.abstractValues.get(SciCmsPublicationAbstractStepModel.selectedLocale)}" 
+                              />
             </div>
             
         </ui:define>
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc.xhtml
index ce48b0b..297e8e0 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc.xhtml
@@ -9,21 +9,21 @@
 
         <ui:define name="authoringStep">
 
-            <h2>#{SciPublicationsUiMessageBundle.getMessage('editsteps.misc.header', SciCmsPublicationAbstractStepModel.publicationTitle)}</h2>
+            <h2>#{SciPublicationsUiMessageBundle.getMessage('editsteps.misc.header', [SciCmsPublicationMiscStepModel.publicationTitle])}</h2>
             
             <librecms:cmsEditorVariants
                 addButtonLabel="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.add_variant']}"
                 addDialogLocaleSelectHelp="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.add.locale_help']}"
                 addMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/add"
-                canEdit="#{SciCmsPublicationAbstractStepModel.canEdit}"
+                canEdit="#{SciCmsPublicationMiscStepModel.canEdit}"
                 editorPageUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit"
-                hasUnusedLocales="#{!SciCmsPublicationAbstractStepModel.unusedLocales.isEmpty()}"
+                hasUnusedLocales="#{!SciCmsPublicationMiscStepModel.unusedLocales.isEmpty()}"
                 headingLevel="3"
                 removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/remove"
                 sourceEditorPageUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit-source"
                 title="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.header']}"
-                unusedLocales="#{SciCmsPublicationAbstractStepModel.unusedLocales}"
-                variants="#{SciCmsPublicationAbstractStepModel.variants}"
+                unusedLocales="#{SciCmsPublicationMiscStepModel.unusedLocales}"
+                variants="#{SciCmsPublicationMiscStepModel.variants}"
                 variantsId="publication-misc"
                 viewPageUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/view"
             />
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/edit.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/edit.xhtml
index 8b6cdb7..03867d3 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/edit.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/edit.xhtml
@@ -10,7 +10,7 @@
         <ui:define name="authoringStep">
             <div class="d-flex">
                 <a class="btn btn-secondary btn-sm align-self-center mr-2"
-                   href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/docuemnts/#{CmsSelectedDocumentModel.itemPath}/@publication-misc">
+                   href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc">
                     <bootstrap:svgIcon icon="caret-left-fill" />
                     <span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.misc.step_back']}</span>
                 </a>
@@ -18,16 +18,16 @@
                 <h2>#{SciPublicationsUiMessageBundle['editsteps.misc.header_edit']}</h2>
             </div>
 
-            <c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}">
+            <c:if test="#{SciCmsPublicationMiscStepModel.canEdit}">
                 <librecms:cmsEditor
-                    backUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/docuemnts/#{CmsSelectedDocumentModel.itemPath}/@publication-misc"
+                    backUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc"
                     baseUrl="#{mvc.basePath}"
-                    canEdit="#{SciCmsPublicationAbstractStepModel.canEdit}"
+                    canEdit="#{SciCmsPublicationMiscStepModel.canEdit}"
                     contentSection="#{ContentSectionModel.sectionName}"
                     editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit"
                     editorId="scipublication-misc-editor"
                     objectIdentifier="#{CmsSelectedDocumentModel.itemPath}"
-                    selectedLocale="#{SciCmsPublicationAbstractStepModel.selectedLocale}"
+                    selectedLocale="#{SciCmsPublicationMiscStepModel.selectedLocale}"
                     title="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.header']}"
                     variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc-resources"
                     />
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/view.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/view.xhtml
index eecb859..b1d7ab2 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/view.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/view.xhtml
@@ -15,26 +15,27 @@
                     <bootstrap:svgIcon icon="caret-left-fill" />
                     <span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.misc.step_back']}</span>
                 </a>
-                
+
                 <h2>#{SciPublicationsUiMessageBundle['editsteps.misc.header_view']}</h2>
-                
+
             </div>
-            
-            <c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}">
+
+            <c:if test="#{SciCmsPublicationMiscStepModel.canEdit}">
                 <div class="text-right">
                     <a class="btn btn-secondary"
-                       href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit">
+                       href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit/#{SciCmsPublicationMiscStepModel.selectedLocale}">
                         <bootstrap:svgIcon icon="pen" />
                         <span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.misc.edit']}</span>
                     </a>
                 </div>
             </c:if>
-            
+
             <div class="cms-text-preview article-text border p-2">
                 <h:outputText escape="false"
-                              value="#{SciCmsPublicationAbstractStepModel.miscValues.get(SciCmsPublicationAbstractStepModel.selectedLocale)}"
+                              value="#{SciCmsPublicationMiscStepModel.miscValues.get(SciCmsPublicationMiscStepModel.selectedLocale)}"
+                              />
             </div>
-            
+
         </ui:define>
     </ui:composition>
 </html>