559749 - Preference administration faulty
Signed-off-by: Juergen Kleck <j.kleck@peak-solution.de>
diff --git a/nucleus/webclient/src/main/webapp/src/app/administration/edit-preference.component.html b/nucleus/webclient/src/main/webapp/src/app/administration/edit-preference.component.html
index f6b3143..022ef40 100644
--- a/nucleus/webclient/src/main/webapp/src/app/administration/edit-preference.component.html
+++ b/nucleus/webclient/src/main/webapp/src/app/administration/edit-preference.component.html
@@ -12,7 +12,7 @@
*
********************************************************************************-->
-<div bsModal #lgModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+<div bsModal #lgModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true" [config]="{ backdrop: false, ignoreBackdropClick: true }">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
@@ -54,7 +54,7 @@
<div class="row" style="margin-top: 20px;">
<div class="col-md-12">
<button type="button" class="btn btn-default" (click)="closeDialog()">
- <span class="fa fa-times"></span>
+ <span class="fa fa-times"></span>
<span translate>administration.edit-preference.btn-cancel</span>
</button>
<button type="button" class="btn btn-default pull-right" (click)="onSave()" [disabled]="!preferenceForm.valid">
diff --git a/nucleus/webclient/src/main/webapp/src/app/administration/preference.component.ts b/nucleus/webclient/src/main/webapp/src/app/administration/preference.component.ts
index 409b20c..883f8ae 100644
--- a/nucleus/webclient/src/main/webapp/src/app/administration/preference.component.ts
+++ b/nucleus/webclient/src/main/webapp/src/app/administration/preference.component.ts
@@ -66,6 +66,7 @@
}
handleDialogResult() {
+ this.subscription.unsubscribe();
if ( !this.editPreferenceComponent.needSave ) {
return;
}
@@ -79,7 +80,6 @@
error => this.notificationService.notifyError(
this.translateService.instant('administration.preference.err-cannot-save-preference'), error)
);
- this.subscription.unsubscribe();
}
reloadPreference( preference: Preference ) {
