Commit cd451f18 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

Merge branch 'fix/16982/develop' into 'develop'

RAF #16982

See merge request maarch/MaarchParapheur!65
parents 471bb61f ff4dad61
......@@ -521,7 +521,7 @@
"messageSaved": "Message enregistré",
"manage_customizationAdmin": "Personnaliser la page de connexion",
"internalUserOtpMsg": "Les autres modes de signatures ne seront plus disponibles pour <b>{{user}}</b> après validation.",
"externalUser": "Role externe",
"externalUser": "Mode externe",
"external": "Externe",
"otpSignaturePositionMandatory": "La position de signature pour les utilisateurs externes est obligatoire."
}
......
......@@ -34,7 +34,7 @@
</ion-segment-button>
</ion-segment>
<ion-buttons slot="end" *ngIf="!detailMode">
<ion-button color="primary" (click)="openAction($event)">
<ion-button color="primary" (click)="openAction($event)" [disabled]="!canShowActions()">
<ion-icon slot="icon-only" name="settings-sharp"></ion-icon>
</ion-button>
</ion-buttons>
......@@ -87,7 +87,7 @@
<drag-scroll style="overflow:auto;height: 100%;width: 100%;margin: auto;"
[drag-scroll-disabled]="(signaturesService.dragging || signaturesService.resizing) && signaturesService.mobileMode"
[drag-disabled]="(signaturesService.dragging || signaturesService.resizing) && !signaturesService.mobileMode"
[style.maxWidth.px]="signaturesService.workingAreaWidth" #nav (click)="currentDoc == 0 && !detailMode ? openAction($event) : false">
[style.maxWidth.px]="signaturesService.workingAreaWidth" #nav (click)="canShowActions() ? openAction($event) : false">
<div style="position:relative;cursor: grab;" [style.width.px]="signaturesService.workingAreaWidth"
[style.height.px]="signaturesService.workingAreaHeight" id="myBounds" #myBounds>
<app-document-note-list *ngIf="currentDoc == 0 && !loadingImage">
......
......@@ -200,14 +200,14 @@ export class DocumentComponent implements OnInit {
this.openSignatures();
}
});
buttons.push({
text: this.translate.instant('lang.annotateDocument'),
icon: 'receipt-outline',
handler: () => {
this.openNoteEditor();
}
});
}
buttons.push({
text: this.translate.instant('lang.annotateDocument'),
icon: 'receipt-outline',
handler: () => {
this.openNoteEditor();
}
});
/* if (this.originalSize) {
buttons.push({
text: 'Zoom taille écran',
......@@ -804,4 +804,8 @@ export class DocumentComponent implements OnInit {
}
return res.buffer;
}
canShowActions() {
return this.currentDoc == 0 && !this.detailMode && !this.signaturesService.stampLock;
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment