Skip to content
Snippets Groups Projects
Verified Commit 56d17091 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FIX #9685 remove old functon + refactoring app-note

parent 97355f76
No related branches found
No related tags found
No related merge requests found
...@@ -218,21 +218,4 @@ class NoteModel ...@@ -218,21 +218,4 @@ class NoteModel
return $notes; return $notes;
} }
public static function getTemplateList(array $aArgs = [])
{
ValidatorModel::arrayType($aArgs, ['entityIds']);
//get notes
$aReturn = DatabaseModel::select([
'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
'table' => ['templates','templates_association'],
'left_join' => ['templates.template_id = templates_association.template_id'],
'where' => ['templates.template_target = ?','templates_association.value_field IN (?)'],
'data' => ['notes', $aArgs['entityIds']],
'order_by' => empty($aArgs['orderBy']) ? ['template_label'] : $aArgs['orderBy']
]);
return $aReturn;
}
} }
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="alert-message alert-message-danger" role="alert" style="margin-top: 30px;" [innerHTML]="lang.openIndexation"></div> <div class="alert-message alert-message-danger" role="alert" style="margin-top: 30px;" [innerHTML]="lang.openIndexation"></div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<app-note-editor #noteEditor></app-note-editor> <app-note-editor #noteEditor [resIds]="data.selectedRes"></app-note-editor>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<b *ngIf="!data.contextMode" color="primary" class="highlight">{{data.selectedRes.length}} {{lang.elements}}</b> ? <b *ngIf="!data.contextMode" color="primary" class="highlight">{{data.selectedRes.length}} {{lang.elements}}</b> ?
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<app-note-editor #noteEditor></app-note-editor> <app-note-editor #noteEditor [resIds]="data.selectedRes"></app-note-editor>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</div> </div>
</div> </div>
<div class="col-md-12" *ngIf="acknowledgement.sendEmail || acknowledgement.sendPaper"> <div class="col-md-12" *ngIf="acknowledgement.sendEmail || acknowledgement.sendPaper">
<app-note-editor #noteEditor></app-note-editor> <app-note-editor #noteEditor [resIds]="data.selectedRes"></app-note-editor>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<app-note-editor #noteEditor></app-note-editor> <app-note-editor #noteEditor [resIds]="data.selectedRes"></app-note-editor>
</div> </div>
</div> </div>
</div> </div>
......
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