Merge pull request #4455 from effective-webwork/ruleset-titles

Allow same title for rulesets of separate clients
kitodo · Jun 3, 2021 · e72455b · e72455b
2 parents 1ad650b + 4ce871f
commit e72455b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/RulesetForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/RulesetForm.java
@@ -131,7 +131,8 @@ private boolean hasValidRulesetFilePath(Ruleset ruleset, String pathToRulesets)
     }
 
     private boolean existsRulesetWithSameName() {
-        List<Ruleset> rulesets = ServiceManager.getRulesetService().getByTitle(this.ruleset.getTitle());
+        List<Ruleset> rulesets = ServiceManager.getRulesetService().getByTitle(this.ruleset.getTitle())
+                .stream().filter(r -> r.getClient().equals(this.ruleset.getClient())).collect(Collectors.toList());
         if (rulesets.isEmpty()) {
             return false;
         } else {

diff --git a/Kitodo/src/main/resources/messages/errors_de.properties b/Kitodo/src/main/resources/messages/errors_de.properties
@@ -144,7 +144,7 @@ errorRenaming=Fehler beim Umbenennen von {0}
 roleAssignedError=Rolle kann nicht gel\u00F6scht werden, da dieser noch Aufgaben zugewiesen sind.
 rulesetInUse=Regelsatz ist noch mit Vorg\u00E4ngen verkn\u00FCpft und kann nicht gel\u00F6scht werden.
 rulesetNotFound=Die angegebene Regelsatzdatei {0} konnte nicht gefunden werden.
-rulesetTitleDuplicated=Der Regelsatz mit den gleichen Titel existiert schon.
+rulesetTitleDuplicated=Ein Regelsatz mit dem gleichen Titel existiert schon.
 
 # S
 errorSaveList=Fehler beim Speichern der Objektliste.

diff --git a/Kitodo/src/main/resources/messages/errors_en.properties b/Kitodo/src/main/resources/messages/errors_en.properties
@@ -143,7 +143,7 @@ errorRenaming=Error renaming {0}
 roleAssignedError=The role could not be deleted because there are still assigned tasks.
 rulesetInUse=The ruleset is still linked to processes and could not be deleted.
 rulesetNotFound=The specified ruleset file {0} could not be found.
-rulesetTitleDuplicated=The ruleset with the same title exists already.
+rulesetTitleDuplicated=A ruleset with the same title already exists.
 
 # S
 errorSaveList=Error during save of list of objects.