From 6e16bf0d207e350110d83d47e3e05cffb59a137e Mon Sep 17 00:00:00 2001 From: Guillaume Heurtier <guillaume.heurtier@maarch.org> Date: Thu, 17 Dec 2020 10:42:39 +0100 Subject: [PATCH] FIX #14795 TIME 2:20 fix import/edit buttons in document template admin --- .../template/template-administration.component.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/frontend/app/administration/template/template-administration.component.html b/src/frontend/app/administration/template/template-administration.component.html index 6ce650b58d7..c70373ee8e2 100755 --- a/src/frontend/app/administration/template/template-administration.component.html +++ b/src/frontend/app/administration/template/template-administration.component.html @@ -163,11 +163,10 @@ </mat-form-field> <button mat-raised-button color="default" type="button" (click)="$event.stopPropagation();editFile()" - *ngIf="((creationMode && selectedModelFile) || (!creationMode))" + *ngIf="((this.creationMode && this.selectedModelFile && this.headerService.user.preferences.documentEdition !== 'java') || (!this.creationMode))" [disabled]="lockFound">{{'lang.templateEdition' | translate}}</button> <button mat-raised-button color="default" type="button" (click)="$event.stopPropagation();uploadSignFileOffice.click()" - *ngIf="((creationMode && !selectedModelFile) || (!creationMode && !functionsService.empty(template.file.name)) && headerService.user.preferences.documentEdition !== 'java')" [disabled]="lockFound">{{'lang.importFile' | translate}}</button> </div> <iframe *ngIf="templateDocView !== null" [src]="templateDocView" @@ -262,11 +261,10 @@ </mat-form-field> <button mat-raised-button color="default" type="button" (click)="$event.stopPropagation();editFile()" - *ngIf="((creationMode && selectedModelFile) || (!creationMode && !functionsService.empty(template.file.paper.name)))" + *ngIf="((this.creationMode && this.selectedModelFile && this.headerService.user.preferences.documentEdition !== 'java') || (!this.creationMode))" [disabled]="lockFound">{{'lang.templateEdition' | translate}}</button> <button mat-raised-button color="default" type="button" (click)="$event.stopPropagation();uploadSignFileOfficeHtml.click()" - *ngIf="!selectedModelFile || (!creationMode && headerService.user.preferences.documentEdition !== 'java')" [disabled]="lockFound">{{'lang.importFile' | translate}}</button> </div> <iframe *ngIf="templateDocView !== null" [src]="templateDocView" -- GitLab