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

fixes

This commit is contained in:
CITE\amentis 2024-08-09 17:42:25 +03:00
parent f2312dabcd
commit 53e27399e1
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/core/src/main/java/org/opencdmp/query/LockQuery.java
View File

@ -177,7 +177,7 @@ public class LockQuery extends QueryBase<LockEntity> {
if (this.like != null && !this.like.isEmpty()) { if (this.like != null && !this.like.isEmpty()) {
this.like = this.like.replaceAll("%", ""); this.like = this.like.replaceAll("%", "");
if (this.conventionService.isValidUUID(this.like)){ if (this.conventionService.isValidUUID(this.like)){
CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(LockEntity._id)); CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(LockEntity._target));
inClause.value(UUID.fromString(this.like)); inClause.value(UUID.fromString(this.like));
predicates.add(inClause); predicates.add(inClause);
} }

2
backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java
View File

@ -380,7 +380,7 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
return ReferenceEntity._typeId; return ReferenceEntity._typeId;
else if (item.prefix(Reference._createdBy)) else if (item.prefix(Reference._createdBy))
return ReferenceEntity._createdById; return ReferenceEntity._createdById;
else if (item.prefix(Reference._belongsToCurrentTenant)) else if (item.match(Reference._belongsToCurrentTenant))
return ReferenceEntity._tenantId; return ReferenceEntity._tenantId;
else else
return null; return null;

1
frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts
View File

@ -115,6 +115,7 @@ export class PrefillingSourceEditorComponent extends BaseEditor<PrefillingSource
buildForm() { buildForm() {
this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.authService.hasPermission(AppPermission.EditPrefillingSource)); this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.authService.hasPermission(AppPermission.EditPrefillingSource));
if (this.isDeleted || !this.authService.hasPermission(AppPermission.EditPrefillingSource)) this.formGroup.disable();
this.prefillingSourceEditorService.setValidationErrorModel(this.editorModel.validationErrorModel); this.prefillingSourceEditorService.setValidationErrorModel(this.editorModel.validationErrorModel);
this.addFieldMapping("reference_id", "searchConfiguration"); this.addFieldMapping("reference_id", "searchConfiguration");
this.addFieldMapping("label", "searchConfiguration"); this.addFieldMapping("label", "searchConfiguration");

2
frontend/src/app/ui/admin/reference/editor/reference-editor.model.ts
View File

@ -147,7 +147,7 @@ export class DefinitionEditorModel implements DefinitionPersist {
const baseContext: ValidationContext = new ValidationContext(); const baseContext: ValidationContext = new ValidationContext();
const baseValidationArray: Validation[] = new Array<Validation>(); const baseValidationArray: Validation[] = new Array<Validation>();
baseValidationArray.push({ key: 'fields', validators: [Validators.required, BackendErrorValidator(validationErrorModel, `${rootPath}fields`)] }); baseValidationArray.push({ key: 'fields', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}fields`)] });
baseContext.validation = baseValidationArray; baseContext.validation = baseValidationArray;
return baseContext; return baseContext;

1
frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.ts
View File

@ -163,6 +163,7 @@ export class NotificationTemplateEditorComponent extends BaseEditor<Notification
buildForm() { buildForm() {
this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.authService.hasPermission(AppPermission.EditNotificationTemplate)); this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.authService.hasPermission(AppPermission.EditNotificationTemplate));
if (this.isDeleted || !this.authService.hasPermission(AppPermission.EditNotificationTemplate)) this.formGroup.disable();
this.notificationTemplateEditorService.setValidationErrorModel(this.editorModel.validationErrorModel); this.notificationTemplateEditorService.setValidationErrorModel(this.editorModel.validationErrorModel);
NotificationTemplateEditorModel.reApplyValueValidators({ NotificationTemplateEditorModel.reApplyValueValidators({
formGroup: this.formGroup, formGroup: this.formGroup,