Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit ec40a93f authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

[EDELIVERY-13740, EDELIVERY-13738] fix UI domain-property dialog description and close button

parent 34045f6f
Branches
Tags
No related merge requests found
...@@ -49,8 +49,7 @@ ...@@ -49,8 +49,7 @@
<mat-icon>check_circle</mat-icon> <mat-icon>check_circle</mat-icon>
<span>{{ "property.details.dialog.button.ok" | translate }}</span> <span>{{ "property.details.dialog.button.ok" | translate }}</span>
</button> </button>
<button mat-raised-button color="primary" mat-dialog-close <button mat-raised-button color="primary" mat-dialog-close>
[disabled]="!isDirty" >
<mat-icon>cancel</mat-icon> <mat-icon>cancel</mat-icon>
<span>{{ "property.details.dialog.button.cancel" | translate }}</span> <span>{{ "property.details.dialog.button.cancel" | translate }}</span>
</button> </button>
......
...@@ -41,6 +41,7 @@ public class DBDomainConfToDomainPropROConverter implements Converter<DBDomainCo ...@@ -41,6 +41,7 @@ public class DBDomainConfToDomainPropROConverter implements Converter<DBDomainCo
target.setProperty(source.getProperty()); target.setProperty(source.getProperty());
target.setSystemDefault(source.isUseSystemDefault()); target.setSystemDefault(source.isUseSystemDefault());
target.setValue(source.getValue()); target.setValue(source.getValue());
target.setDesc(source.getDescription());
target.setValuePattern(enumType.getValuePattern().pattern()); target.setValuePattern(enumType.getValuePattern().pattern());
target.setType(enumType.getPropertyType().name()); target.setType(enumType.getPropertyType().name());
target.setSystemDefaultValue(configurationService.getDefaultDomainConfiguration(enumType)); target.setSystemDefaultValue(configurationService.getDefaultDomainConfiguration(enumType));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment