Skip to content

Commit b2c926e

Browse files
committed
Improve filegroup handling
1 parent 43d7dfc commit b2c926e

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

Kitodo/src/main/java/org/kitodo/production/forms/ProjectEditView.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class ProjectEditView extends BaseEditView {
7070
private boolean locked = true;
7171
private static final String TITLE_USED = "projectTitleAlreadyInUse";
7272
private Boolean hasProcesses;
73-
73+
private String originalFileGroup;
7474
private Project baseProject;
7575
/**
7676
* The folder currently under edit in the pop-up dialog.
@@ -123,6 +123,7 @@ public Folder getEditingFolder() {
123123
*/
124124
public void setEditingFolder(Folder folder) {
125125
this.editingFolder = folder;
126+
this.originalFileGroup = Objects.nonNull(folder) ? folder.getFileGroup() : null;
126127
this.generator = new FolderGenerator(folder);
127128
}
128129

@@ -282,6 +283,7 @@ public void saveFolder() {
282283
&& Objects.equals(folder.getFileGroup(), editingFolder.getFileGroup()));
283284
if (duplicate) {
284285
Helper.setErrorMessage("errorDuplicateFilegroup", new Object[] {ObjectType.FOLDER.getTranslationPlural()});
286+
editingFolder.setFileGroup(originalFileGroup);
285287
return;
286288
}
287289

0 commit comments

Comments
 (0)