MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

small fix

This commit is contained in:
CITE\amentis 2024-09-09 10:06:03 +03:00
parent f8d074b81c
commit 964aa89912
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SectionPersist.java
View File

@ -180,6 +180,7 @@ public class SectionPersist {
.must(() -> item.getDescriptionTemplates().stream().map(DescriptionTemplatePersist::getDescriptionTemplateGroupId).distinct().collect(Collectors.toList()).size() == item.getDescriptionTemplates().size()) .must(() -> item.getDescriptionTemplates().stream().map(DescriptionTemplatePersist::getDescriptionTemplateGroupId).distinct().collect(Collectors.toList()).size() == item.getDescriptionTemplates().size())
.failOn(SectionPersist._descriptionTemplates).failWith(this.messageSource.getMessage("Validation_Unique", new Object[]{SectionPersist._descriptionTemplates}, LocaleContextHolder.getLocale())), .failOn(SectionPersist._descriptionTemplates).failWith(this.messageSource.getMessage("Validation_Unique", new Object[]{SectionPersist._descriptionTemplates}, LocaleContextHolder.getLocale())),
this.spec() this.spec()
.iff(() -> !this.isListNullOrEmpty(item.getDescriptionTemplates()))
.must(() -> !this.isNull(item.getPrefillingSourcesEnabled())) .must(() -> !this.isNull(item.getPrefillingSourcesEnabled()))
.failOn(SectionPersist._prefillingSourcesEnabled).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._prefillingSourcesEnabled}, LocaleContextHolder.getLocale())) .failOn(SectionPersist._prefillingSourcesEnabled).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._prefillingSourcesEnabled}, LocaleContextHolder.getLocale()))

4
frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.model.ts
View File

@ -183,9 +183,9 @@ export class PlanBlueprintDefinitionSectionEditorModel implements PlanBlueprintD
description: string; description: string;
ordinal: number; ordinal: number;
fields: FieldInSectionEditorModel[] = []; fields: FieldInSectionEditorModel[] = [];
hasTemplates: boolean; hasTemplates: boolean = false;
descriptionTemplates?: DescriptionTemplatesInSectionEditorModel[] = []; descriptionTemplates?: DescriptionTemplatesInSectionEditorModel[] = [];
prefillingSourcesEnabled: boolean; prefillingSourcesEnabled: boolean = false;
prefillingSourcesIds: Guid[]= []; prefillingSourcesIds: Guid[]= [];
protected formBuilder: UntypedFormBuilder = new UntypedFormBuilder(); protected formBuilder: UntypedFormBuilder = new UntypedFormBuilder();