diff --git a/src/app/note/models/NoteModel.php b/src/app/note/models/NoteModel.php index 8a2cdd4b9f583853336b5911c83ae288eb3f6abf..4b5ac8b452eb48d96aebccc9cf95e17fbd2d9415 100755 --- a/src/app/note/models/NoteModel.php +++ b/src/app/note/models/NoteModel.php @@ -218,21 +218,4 @@ class NoteModel 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; - } } diff --git a/src/frontend/app/actions/close-and-index-action/close-and-index-action.component.html b/src/frontend/app/actions/close-and-index-action/close-and-index-action.component.html index bdf7e3715fe28c56640cfc1c373727fb7792dc61..3b7dd1c614d033fecedabcdaf35c7a3f833d6502 100644 --- a/src/frontend/app/actions/close-and-index-action/close-and-index-action.component.html +++ b/src/frontend/app/actions/close-and-index-action/close-and-index-action.component.html @@ -12,7 +12,7 @@ <div class="alert-message alert-message-danger" role="alert" style="margin-top: 30px;" [innerHTML]="lang.openIndexation"></div> </div> <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> diff --git a/src/frontend/app/actions/confirm-action/confirm-action.component.html b/src/frontend/app/actions/confirm-action/confirm-action.component.html index b271561a6804955507c2992f5a137559c83e0256..e1410cdafca29eb8ee1553ed6e97b8a1945aad4a 100644 --- a/src/frontend/app/actions/confirm-action/confirm-action.component.html +++ b/src/frontend/app/actions/confirm-action/confirm-action.component.html @@ -10,7 +10,7 @@ <b *ngIf="!data.contextMode" color="primary" class="highlight">{{data.selectedRes.length}} {{lang.elements}}</b> ? </div> <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> diff --git a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html index 90c9a9a478ecb24ac837094318e51cd266f130d4..5ca026817a16898e3b59f061050d886f3192f979 100644 --- a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html +++ b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html @@ -56,7 +56,7 @@ </div> </div> <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> diff --git a/src/frontend/app/actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component.html b/src/frontend/app/actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component.html index 169e0ec88c232bd56ff38e8fb8deeb7859fea8bb..ffd533c1a93e4b3c7962187c08cc580a7e323b1d 100644 --- a/src/frontend/app/actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component.html +++ b/src/frontend/app/actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component.html @@ -19,7 +19,7 @@ </div> </div> <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>