diff --git a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php index 82c5b2bc2ff760417683ca92d2732ef70a15658b..f94f71ad3fe24a337e4adfffeed9e2e3315d5896 100755 --- a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php +++ b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php @@ -684,7 +684,7 @@ if ($mode == 'normal') { } if ($tab[$i][$j][$value] == 'count_attachment') { - $excludeAttachmentTypes = ['converted_pdf', 'printed_folder']; + $excludeAttachmentTypes = ['converted_pdf', 'print_folder']; if (!$core_tools->test_service('view_documents_with_notes', 'attachments', false)) { $excludeAttachmentTypes[] = 'document_with_notes'; } diff --git a/apps/maarch_entreprise/loadRepList.php b/apps/maarch_entreprise/loadRepList.php index 63300d4bc898b63d79c655f33af9db42ab06bfc8..777e0bb6c4b99bb51e78da7dc15038b1d768618c 100755 --- a/apps/maarch_entreprise/loadRepList.php +++ b/apps/maarch_entreprise/loadRepList.php @@ -54,7 +54,7 @@ if (isset($_REQUEST['res_id_master'])) { $db = new Database(); - $excludeAttachmentTypes = ['converted_pdf', 'printed_folder']; + $excludeAttachmentTypes = ['converted_pdf', 'print_folder']; if (!$Core_Tools->test_service('view_documents_with_notes', 'attachments', false)) { $excludeAttachmentTypes[] = 'document_with_notes'; } diff --git a/modules/visa/class/MaarchParapheurController.php b/modules/visa/class/MaarchParapheurController.php index 542b5b462bdb18501931f1fae667ea771424f5ac..311696658ab3ceef29d631e116fce9f57170ec18 100755 --- a/modules/visa/class/MaarchParapheurController.php +++ b/modules/visa/class/MaarchParapheurController.php @@ -89,7 +89,7 @@ class MaarchParapheurController $senderPrimaryEntity = \User\models\UserModel::getPrimaryEntityByUserId(['userId' => $aArgs['userId']]); if ($aArgs['objectSent'] == 'attachment') { - $excludeAttachmentTypes = ['converted_pdf', 'printed_folder', 'incoming_mail_attachment', 'signed_response']; + $excludeAttachmentTypes = ['converted_pdf', 'print_folder', 'incoming_mail_attachment', 'signed_response']; $attachments = \Attachment\models\AttachmentModel::getOnView([ 'select' => [ diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php index ee0a9910da9c24b71dfe87c4c51606b01e00a62e..42f0ce13c15394715c56876b8db401f4a6f209e0 100755 --- a/src/app/attachment/controllers/AttachmentController.php +++ b/src/app/attachment/controllers/AttachmentController.php @@ -76,7 +76,7 @@ class AttachmentController return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']); } - $excludeAttachmentTypes = ['converted_pdf', 'printed_folder']; + $excludeAttachmentTypes = ['converted_pdf', 'print_folder']; if (!ServiceModel::hasService(['id' => 'view_documents_with_notes', 'userId' => $GLOBALS['userId'], 'location' => 'attachments', 'type' => 'use'])) { $excludeAttachmentTypes[] = 'document_with_notes'; } diff --git a/src/app/attachment/models/AttachmentModelAbstract.php b/src/app/attachment/models/AttachmentModelAbstract.php index 416dff6f72375aa77eb1b1c9ed3e7cdcff270206..aa24e5fdeaf5c74c1230a7893ea72b178cfe8674 100755 --- a/src/app/attachment/models/AttachmentModelAbstract.php +++ b/src/app/attachment/models/AttachmentModelAbstract.php @@ -75,7 +75,7 @@ abstract class AttachmentModelAbstract 'select' => empty($aArgs['select']) ? ['max(relation) as relation', 'res_id_master', 'title', 'res_id', 'res_id_version', 'identifier', 'dest_address_id'] : $aArgs['select'], 'table' => ['res_view_attachments'], 'where' => ['res_id_master in (?)', 'status not in (?, ?)', 'attachment_type not in (?, ?)', 'in_send_attach = TRUE'], - 'data' => [$aArgs['ids'], 'OBS', 'DEL', 'converted_pdf', 'printed_folder'], + 'data' => [$aArgs['ids'], 'OBS', 'DEL', 'converted_pdf', 'print_folder'], 'groupBy' => ['res_id_master', 'title', 'res_id', 'res_id_version', 'identifier', 'dest_address_id'], 'order_by' => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'] ]); diff --git a/src/app/resource/controllers/ResourceListController.php b/src/app/resource/controllers/ResourceListController.php index 65ab53e1134fc496a728306df0156ba5307c897c..c9dc9cd1ff77c48c1f34c5200d12158ff0d7422a 100644 --- a/src/app/resource/controllers/ResourceListController.php +++ b/src/app/resource/controllers/ResourceListController.php @@ -93,7 +93,7 @@ class ResourceListController $formattedResources = []; if (!empty($resIds)) { - $excludeAttachmentTypes = ['converted_pdf', 'printed_folder']; + $excludeAttachmentTypes = ['converted_pdf', 'print_folder']; if (!ServiceModel::hasService(['id' => 'view_documents_with_notes', 'userId' => $GLOBALS['userId'], 'location' => 'attachments', 'type' => 'use'])) { $excludeAttachmentTypes[] = 'document_with_notes'; }