From 5f34d60d31e6663c734a48aa933bf08e197a6910 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Tue, 23 Aug 2022 20:42:48 +0200
Subject: [PATCH] Bugfixes for authoring steps for article in journal

---
 .../ArticleInJournalPropertiesStep.java       | 28 +++++++++++--------
 .../edit-articleinjournal.xhtml               | 25 ++++++++---------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInJournalPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInJournalPropertiesStep.java
index 3d166b4..91d4242 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInJournalPropertiesStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInJournalPropertiesStep.java
@@ -3,6 +3,7 @@ package org.scientificcms.publications.ui.contenttypes;
 import org.libreccm.api.Identifier;
 import org.libreccm.api.IdentifierParser;
 import org.libreccm.security.AuthorizationRequired;
+import org.librecms.contentsection.AssetRepository;
 import org.librecms.ui.contentsections.ContentSectionNotFoundException;
 import org.librecms.ui.contentsections.ItemPermissionChecker;
 import org.librecms.ui.contentsections.documents.DocumentNotFoundException;
@@ -13,6 +14,7 @@ import org.scientificcms.publications.ArticleInJournal;
 import org.scientificcms.publications.ArticleInJournalManager;
 import org.scientificcms.publications.Journal;
 import org.scientificcms.publications.JournalRepository;
+import org.scientificcms.publications.assets.JournalAsset;
 import org.scientificcms.publications.contenttypes.ArticleInJournalItem;
 import org.scientificcms.publications.ui.SciPublicationsUiConstants;
 import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
@@ -54,11 +56,14 @@ public class ArticleInJournalPropertiesStep
     extends AbstractPublicationPropertiesStep<ArticleInJournalItem, ArticleInJournal> {
 
     public static final String EDIT_STEP_URL_FRAGMENT
-                                   = "articleinjournal-basicproperties";
+        = "articleinjournal-basicproperties";
 
     @Inject
     private ArticleInJournalManager articleManager;
 
+    @Inject
+    private AssetRepository assetRepo;
+
     @Inject
     private DocumentUi documentUi;
 
@@ -68,9 +73,6 @@ public class ArticleInJournalPropertiesStep
     @Inject
     private ItemPermissionChecker itemPermissionChecker;
 
-    @Inject
-    private JournalRepository journalRepository;
-
     @Inject
     private Models models;
 
@@ -359,18 +361,20 @@ public class ArticleInJournalPropertiesStep
             final Identifier identifier = identifierParser.parseIdentifier(
                 journalIdentifer
             );
-            final Optional<Journal> journalResult;
+            final Optional<JournalAsset> journalResult;
             switch (identifier.getType()) {
                 case ID:
-                    journalResult = journalRepository.findById(
+                    journalResult = assetRepo.findById(
                         Long.parseLong(
                             identifier.getIdentifier()
-                        )
+                        ),
+                        JournalAsset.class
                     );
                     break;
                 case UUID:
-                    journalResult = journalRepository.findByUuid(
-                        identifier.getIdentifier()
+                    journalResult = assetRepo.findByUuidAndType(
+                        identifier.getIdentifier(),
+                        JournalAsset.class
                     );
                     break;
                 default:
@@ -386,7 +390,7 @@ public class ArticleInJournalPropertiesStep
                 );
             }
 
-            final Journal journal = journalResult.get();
+            final Journal journal = journalResult.get().getJournal();
             articleManager.setJournal(getPublication(), journal);
 
             return buildRedirectPathForStep();
@@ -400,7 +404,7 @@ public class ArticleInJournalPropertiesStep
     }
 
     @POST
-    @Path("/journal/remove")
+    @Path("/journal/@remove")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String removeCollectedVolume(
@@ -487,6 +491,8 @@ public class ArticleInJournalPropertiesStep
                 );
             }
 
+            getPublication().setPublicationDate(publicationDate);
+
             if (startPageParam.matches("\\d*")) {
                 getPublication().setStartPage(Integer.parseInt(startPageParam));
             }
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/articleinjournal/edit-articleinjournal.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/articleinjournal/edit-articleinjournal.xhtml
index 4924c9c..3144ca0 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/articleinjournal/edit-articleinjournal.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/articleinjournal/edit-articleinjournal.xhtml
@@ -14,7 +14,7 @@
         <ui:param name="authoringStepTitle"
                   value="#{SciPublicationsUiMessageBundle.getMessage('articleinjournal.basicproperties.header', [SciCmsPublicationPropertiesStepModel.name])}" />
 
-        <ui:define name="publicatonMessages">
+        <ui:define name="publicationMessages">
             <c:if test="#{journalNotFound != null}">
                 <div class="alert alert-warning" role="alert">
                     #{SciPublicationsUiMessageBundle.getMessage('articleinjournal.basicproperties.errors.journal_not_found', [journalNotFound])}
@@ -133,19 +133,18 @@
                         #{SciCmsArticleInJournalPropertiesStepModel.journalTitle}
                     </p>
                 </c:otherwise>
-                <c:if test="#{CmsSelectedDocumentModel.canEdit and SciCmsArticleInJournalPropertiesStepModel.journalTitle == null}">
-                    <libreccm:deleteDialog
-                        actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@articleinjournal-basicproperties/journal/@remove"
-                        buttonText="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.label']}"
-                        cancelLabel="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.cancel']}"
-                        confirmLabel="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.confirm']}"
-                        dialogId="journal-remove"
-                        dialogTitle="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.title']}"
-                        message="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.message']}" 
-                        />
-
-                </c:if>
             </c:choose>
+            <c:if test="#{CmsSelectedDocumentModel.canEdit and SciCmsArticleInJournalPropertiesStepModel.journalTitle != null}">
+                <libreccm:deleteDialog
+                    actionTarget="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@articleinjournal-basicproperties/journal/@remove"
+                    buttonText="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.label']}"
+                    cancelLabel="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.cancel']}"
+                    confirmLabel="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.confirm']}"
+                    dialogId="journal-remove"
+                    dialogTitle="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.title']}"
+                    message="#{SciPublicationsUiMessageBundle['articleinjournal.edit.journal.remove.message']}" 
+                    />
+            </c:if>
 
         </ui:define>