Skip to content
Snippets Groups Projects
Commit 82f3bcb4 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #13253 TIME 0:25 add mail model + signature model

parent ef30d01f
No related branches found
No related tags found
No related merge requests found
......@@ -121,7 +121,7 @@
</mat-list-item>
</mat-list>
</div>
<!--<div class="models" *ngIf="canManageMail()">
<div class="models" *ngIf="canManageMail()">
<plugin-select-search *ngIf="availableEmailModels.length > 0" [label]="lang.emailModel"
[placeholderLabel]="lang.emailModel" [datas]="availableEmailModels"
[formControlSelect]="templateEmailListForm" (afterSelected)="mergeEmailTemplate($event)">
......@@ -132,7 +132,7 @@
[datas]="availableSignEmailModels" [formControlSelect]="emailSignListForm"
(afterSelected)="mergeSignEmailTemplate($event)">
</plugin-select-search>
</div>-->
</div>
<mat-divider></mat-divider>
<div class="row" style="margin: 0;padding-top: 10px;" *ngIf="!canManageMail()">
<div class="col-md-9">
......
......@@ -58,7 +58,6 @@ export class SentNumericPackagePageComponent implements OnInit {
emailCreatorId: number = null;
emailId: number = null;
emailStatus: string = 'WAITING';
emailContent: string = '';
currentEmailAttachTool: string = '';
emailAttachTool: any = {
document: {
......@@ -156,7 +155,7 @@ export class SentNumericPackagePageComponent implements OnInit {
tap((data: any) => {
var textArea = document.createElement('textarea');
textArea.innerHTML = data.mergedDocument;
this.emailContent += this.stringPipe.transform(textArea.value);
this.numericPackage.content += this.stringPipe.transform(textArea.value);
}),
catchError((err) => {
this.notify.handleSoftErrors(err);
......@@ -172,8 +171,8 @@ export class SentNumericPackagePageComponent implements OnInit {
this.http.get(`../../rest/currentUser/emailSignatures/${templateId}`).pipe(
tap((data: any) => {
var textArea = document.createElement('textarea');
textArea.innerHTML = data.mergedDocument;
this.emailContent += this.stringPipe.transform(textArea.value);
textArea.innerHTML = data.emailSignature.content;
this.numericPackage.content += this.stringPipe.transform(textArea.value);
}),
catchError((err) => {
this.notify.handleSoftErrors(err);
......
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