diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/CalendarForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/CalendarForm.java index c1855455af9..2f687b8d021 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/CalendarForm.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/CalendarForm.java @@ -603,7 +603,8 @@ public void removeBlock(Block block) { */ public void addIssue(Block block) { if (Objects.nonNull(block)) { - Issue issue = block.addIssue(); + block.addIssue(); + block.checkIssuesWithSameHeading(); } } @@ -919,11 +920,13 @@ public String getMetadataValue(ProcessDetail processDetail) { */ public void checkDuplicatedTitles() throws ProcessGenerationException, DataException, DAOException, ConfigurationException, IOException, DoctypeMissingException { - Process process = ServiceManager.getProcessService().getById(parentId); - NewspaperProcessesGenerator newspaperProcessesGenerator = new NewspaperProcessesGenerator(process, course); - newspaperProcessesGenerator.initialize(); - if (!newspaperProcessesGenerator.isDuplicatedTitles()) { - PrimeFaces.current().executeScript("PF('createProcessesConfirmDialog').show();"); + if (course.parallelStream().noneMatch(block -> Objects.equals(block.checkIssuesWithSameHeading(), true))) { + Process process = ServiceManager.getProcessService().getById(parentId); + NewspaperProcessesGenerator newspaperProcessesGenerator = new NewspaperProcessesGenerator(process, course); + newspaperProcessesGenerator.initialize(); + if (!newspaperProcessesGenerator.isDuplicatedTitles()) { + PrimeFaces.current().executeScript("PF('createProcessesConfirmDialog').show();"); + } } } diff --git a/Kitodo/src/main/resources/messages/messages_de.properties b/Kitodo/src/main/resources/messages/messages_de.properties index 2e61210ea4e..713c37a66f7 100644 --- a/Kitodo/src/main/resources/messages/messages_de.properties +++ b/Kitodo/src/main/resources/messages/messages_de.properties @@ -119,7 +119,7 @@ calendar.issue.add=Ausgabe hinzuf\u00FCgen calendar.issue.delete=Ausgabe l\u00F6schen calendar.issue.delete.query=Wollen Sie die Augabe l\u00F6schen? calendar.jumpToDay=Zu Tag springen -calendar.metadata.global.add=Metadatum allen Ausgaben hinzuf\u00FCgen +calendar.metadata.global.add=Metadatum allen Ausgaben hinzuf\u00FCgen calendar.metadata.issue.add=Metadatum hinzuf\u00FCgen calendar.metadata.global.add.tooltip=Metadatum zu allen erschienen Ausgaben hinzuf\u00FCgen calendar.metadata.issue.add.tooltip=Metadatum zu allen erschienen Ausgaben ab dieser hinzuf\u00FCgen diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/calendarEdit/calendarDayDialog.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/calendarEdit/calendarDayDialog.xhtml index daaf4de6989..473e5be5ccc 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/calendarEdit/calendarDayDialog.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/calendarEdit/calendarDayDialog.xhtml @@ -153,7 +153,7 @@ title="#{metadata.metadataDetail.value}"> - + @@ -162,7 +162,7 @@ pattern="yyyy-MM-dd" styleClass="input-with-button" showOn="button"> - + @@ -170,7 +170,7 @@ value="#{metadata.metadataDetail.selectedItems}" showCheckbox="true"> - + - + @@ -191,14 +191,14 @@ layout="grid" columns="1"> - + - +