Skip to content
Snippets Groups Projects
Commit cad19d97 authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FIX #14483 TIME 0:30 fix hide button title + fix stuck on no file in signature book

parent 1440ea37
No related branches found
No related tags found
No related merge requests found
......@@ -191,7 +191,7 @@ class TemplateController
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
}
$template = TemplateModel::getById(['select' => ['template_style', 'template_file_name', 'template_type', 'template_target', 'subject'], 'id' => $aArgs['id']]);
$template = TemplateModel::getById(['select' => ['template_type', 'template_target'], 'id' => $aArgs['id']]);
if (empty($template)) {
return $response->withStatus(400)->withJson(['errors' => 'Template does not exist']);
}
......
......@@ -154,7 +154,7 @@
<div class="col-md-12" *ngIf="group.canAdminUsers" style="padding:5px;">
<plugin-autocomplete [labelPlaceholder]="lang.linkUser"
[labelList]="lang.availableUsers" [routeDatas]="['/rest/autocomplete/users/administration']"
[targetSearchKey]="'idToDisplay'" [subInfoKey]="'id'"
[targetSearchKey]="'idToDisplay'"
(triggerEvent)="linkUser($event)"></plugin-autocomplete>
<hr />
</div>
......
......@@ -607,6 +607,7 @@ export class DocumentViewerComponent implements OnInit, OnDestroy {
this.file.contentView = `../rest/attachments/${resId}/content?mode=base64`;
this.file.src = this.base64ToArrayBuffer(data.encodedDocument);
this.loading = false;
this.noFile = false;
}
},
(err: any) => {
......@@ -646,6 +647,7 @@ export class DocumentViewerComponent implements OnInit, OnDestroy {
this.file.contentView = `../rest/resources/${resId}/content?mode=base64`;
this.file.src = this.base64ToArrayBuffer(data.encodedDocument);
this.loading = false;
this.noFile = false;
}
},
(err: any) => {
......
......@@ -8,7 +8,7 @@
<mat-icon class="fas" [class.fa-expand]="!fullscreenMode" [class.fa-compress]="fullscreenMode" style="height:auto;"></mat-icon>
</button>
<button class="collaboraOnlineButton_hide" [class.buttonsHide]="hideButtons" [class.fullScreen]="fullscreenMode" mat-mini-fab color="default"
[title]="lang.closeEditor" (click)="hideButtons = !hideButtons">
[title]="!hideButtons ? lang.hideTool : lang.showTool" (click)="hideButtons = !hideButtons">
<mat-icon class="fa fa-arrow-right" style="height:auto;"></mat-icon>
</button>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment