Skip to content
Snippets Groups Projects
Verified Commit 7864ce4a authored by Florian Azizian's avatar Florian Azizian
Browse files

Merge branch 'externalSignatureBooks2' into develop

parents 69857437 f08cde7f
No related branches found
No related tags found
No related merge requests found
...@@ -165,7 +165,7 @@ class FastParapheurController ...@@ -165,7 +165,7 @@ class FastParapheurController
$attachments = \Attachment\models\AttachmentModel::getOnView([ $attachments = \Attachment\models\AttachmentModel::getOnView([
'select' => ['res_id', 'res_id_version', 'title', 'attachment_type','path', 'res_id_master', 'format'], 'select' => ['res_id', 'res_id_version', 'title', 'attachment_type','path', 'res_id_master', 'format'],
'where' => ['res_id_master = ?', 'attachment_type not in (?)', "status not in ('DEL', 'OBS')", 'in_signature_book = TRUE', "format = 'pdf'"], 'where' => ['res_id_master = ?', 'attachment_type not in (?)', "status not in ('DEL', 'OBS')", 'in_signature_book = TRUE', "format = 'pdf'"],
'data' => [$aArgs['resIdMaster'], ['incoming_mail_attachment', 'print_folder']] 'data' => [$aArgs['resIdMaster'], ['incoming_mail_attachment', 'print_folder', 'signed_response']]
]); ]);
$attachmentToFreeze = []; $attachmentToFreeze = [];
......
...@@ -87,8 +87,8 @@ class IParapheurController ...@@ -87,8 +87,8 @@ class IParapheurController
$attachments = \Attachment\models\AttachmentModel::getOnView([ $attachments = \Attachment\models\AttachmentModel::getOnView([
'select' => ['res_id', 'res_id_version', 'title', 'attachment_type','path'], 'select' => ['res_id', 'res_id_version', 'title', 'attachment_type','path'],
'where' => ['res_id_master = ?', 'attachment_type not in (?)', "status not in ('DEL', 'OBS')", 'in_signature_book = TRUE', "format = 'pdf'"], 'where' => ['res_id_master = ?', 'attachment_type not in (?)', "status not in ('DEL', 'OBS')", 'in_signature_book = TRUE', "format = 'pdf'"],
'data' => [$aArgs['resIdMaster'], ['incoming_mail_attachment', 'print_folder']] 'data' => [$aArgs['resIdMaster'], ['incoming_mail_attachment', 'print_folder', 'signed_response']]
]); ]);
for($i = 0; $i < count($attachments); $i++){ for($i = 0; $i < count($attachments); $i++){
......
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