From b74d82e5b73779afc8352d43be5745f6bec324e9 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 11 Aug 2020 10:40:05 +0200
Subject: [PATCH] FEAT #14455 TIME 0:15 fix route update image
---
.../parameters-customization.component.html | 14 ++++----
.../parameters-customization.component.ts | 32 +++++++++++--------
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/frontend/app/administration/parameter/customization/parameters-customization.component.html b/src/frontend/app/administration/parameter/customization/parameters-customization.component.html
index f8f07ad89e6..8e0d1b87f07 100644
--- a/src/frontend/app/administration/parameter/customization/parameters-customization.component.html
+++ b/src/frontend/app/administration/parameter/customization/parameters-customization.component.html
@@ -28,22 +28,22 @@
<div>{{'lang.chooseLoginBg' | translate}} : </div>
<div class="backgroundList">
<mat-card (click)="selectBg('../rest/images?image=loginPage')" style="opacity: 0.3;" class="backgroundItem"
- [class.disabled]="stepFormGroup.controls['bodyLoginBackground'].disabled"
- [class.selected]="stepFormGroup.controls['bodyLoginBackground'].value === '../rest/images?image=loginPage'"
+ [class.disabled]="stepFormGroup.controls['bodyImage'].disabled"
+ [class.selected]="stepFormGroup.controls['bodyImage'].value === '../rest/images?image=loginPage'"
style="background:url(../rest/images?image=loginPage);background-size: cover;">
</mat-card>
<mat-card (click)="selectBg('assets/bodylogin.jpg')" style="opacity: 0.3;" class="backgroundItem"
- [class.disabled]="stepFormGroup.controls['bodyLoginBackground'].disabled"
- [class.selected]="stepFormGroup.controls['bodyLoginBackground'].value === 'assets/bodylogin.jpg'"
+ [class.disabled]="stepFormGroup.controls['bodyImage'].disabled"
+ [class.selected]="stepFormGroup.controls['bodyImage'].value === 'assets/bodylogin.jpg'"
style="background:url(assets/bodylogin.jpg);background-size: cover;">
</mat-card>
<mat-card *ngFor="let background of backgroundList" (click)="selectBg(background.url)"
style="opacity: 0.3;" class="backgroundItem"
- [class.selected]="background.url === stepFormGroup.controls['bodyLoginBackground'].value"
- [class.disabled]="stepFormGroup.controls['bodyLoginBackground'].disabled"
+ [class.selected]="background.url === stepFormGroup.controls['bodyImage'].value"
+ [class.disabled]="stepFormGroup.controls['bodyImage'].disabled"
[style.background]="'url('+background.url+')'">
</mat-card>
- <mat-card *ngIf="!stepFormGroup.controls['bodyLoginBackground'].disabled"
+ <mat-card *ngIf="!stepFormGroup.controls['bodyImage'].disabled"
style="opacity: 0.3;display: flex;align-items: center;justify-content: center;"
class="backgroundItem" (click)="uploadFile.click()">
<input type="file" name="files[]" #uploadFile (change)="uploadTrigger($event, 'bg')"
diff --git a/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts b/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts
index e50147f4fbf..fa19f873280 100644
--- a/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts
+++ b/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts
@@ -36,8 +36,8 @@ export class ParametersCustomizationComponent implements OnInit, OnDestroy {
appName: ['', Validators.required],
loginpage_message: [''],
homepage_message: [''],
- bodyLoginBackground: ['../rest/images?image=loginPage'],
- uploadedLogo: ['../rest/images?image=logo'],
+ bodyImage: ['../rest/images?image=loginPage'],
+ logo: ['../rest/images?image=logo'],
});
this.backgroundList = Array.from({ length: 16 }).map((_, i) => {
@@ -133,7 +133,8 @@ export class ParametersCustomizationComponent implements OnInit, OnDestroy {
reader.readAsDataURL(fileInput.target.files[0]);
reader.onload = (value: any) => {
if (mode === 'logo') {
- this.stepFormGroup.controls['uploadedLogo'].setValue(value.target.result);
+ this.stepFormGroup.controls['logo'].setValue(value.target.result);
+ this.saveParameter('logo');
} else {
const img = new Image();
img.onload = (imgDim: any) => {
@@ -144,8 +145,8 @@ export class ParametersCustomizationComponent implements OnInit, OnDestroy {
filename: value.target.result,
url: value.target.result,
});
- this.stepFormGroup.controls['bodyLoginBackground'].setValue(value.target.result);
- this.saveParameter('bodyLoginBackground');
+ this.stepFormGroup.controls['bodyImage'].setValue(value.target.result);
+ this.saveParameter('bodyImage');
}
};
img.src = value.target.result;
@@ -177,26 +178,31 @@ export class ParametersCustomizationComponent implements OnInit, OnDestroy {
}
logoURL() {
- return this.sanitizer.bypassSecurityTrustUrl(this.stepFormGroup.controls['uploadedLogo'].value);
+ return this.sanitizer.bypassSecurityTrustUrl(this.stepFormGroup.controls['logo'].value);
}
selectBg(content: string) {
- if (!this.stepFormGroup.controls['bodyLoginBackground'].disabled) {
- this.stepFormGroup.controls['bodyLoginBackground'].setValue(content);
- this.saveParameter('bodyLoginBackground');
+ if (!this.stepFormGroup.controls['bodyImage'].disabled) {
+ this.stepFormGroup.controls['bodyImage'].setValue(content);
+ this.saveParameter('bodyImage');
}
}
clickLogoButton(uploadLogo: any) {
- if (!this.stepFormGroup.controls['uploadedLogo'].disabled) {
+ if (!this.stepFormGroup.controls['logo'].disabled) {
uploadLogo.click();
}
}
saveParameter(parameterId: string) {
- const param = {
- param_value_string: this.stepFormGroup.controls[parameterId].value
- };
+ let param = {};
+ if (parameterId === 'logo' || parameterId === 'bodyImage') {
+ param['image'] = this.stepFormGroup.controls[parameterId].value;
+ } else {
+ param = {
+ param_value_string: this.stepFormGroup.controls[parameterId].value
+ };
+ }
this.http.put('../rest/parameters/' + parameterId, param)
.subscribe(() => {
this.notify.success(this.translate.instant('lang.parameterUpdated'));
--
GitLab