diff --git a/migration/20.03/2003.sql b/migration/20.03/2003.sql index 854bde47e2145f0683e80c22ef01c0dc01c769a3..d15bb67ac9eb4bf7fb51eb5c824821134d0ffda0 100755 --- a/migration/20.03/2003.sql +++ b/migration/20.03/2003.sql @@ -586,10 +586,10 @@ FROM usergroups_services WHERE group_id IN ( WHERE service_id = 'sendmail' AND group_id not in (SELECT group_id FROM usergroups_services WHERE service_id = 'manage_numeric_package') ); -DELETE FROM usergroups_services WHERE service_id = 'include_folder_perimeter'; +DELETE FROM usergroups_services WHERE service_id = 'include_folders_and_followed_resources_perimeter'; INSERT INTO usergroups_services (group_id, service_id) -SELECT distinct(group_id), 'include_folder_perimeter' FROM usergroups_services; +SELECT distinct(group_id), 'include_folders_and_followed_resources_perimeter' FROM usergroups_services; INSERT INTO usergroups_services (group_id, service_id) SELECT distinct(group_id), 'update_diffusion_indexing' diff --git a/migration/20.03/20036.sql b/migration/20.03/20036.sql index 1fc0fdbe99b330b42c458e4664f981f12d56a3d2..07eefff5ed7f065b5736ecde56ef32c7ed5e2f3f 100644 --- a/migration/20.03/20036.sql +++ b/migration/20.03/20036.sql @@ -6,10 +6,10 @@ -- -- -- *************************************************************************-- -DELETE FROM usergroups_services WHERE service_id = 'include_folder_perimeter'; +DELETE FROM usergroups_services WHERE service_id = 'include_folders_and_followed_resources_perimeter'; INSERT INTO usergroups_services (group_id, service_id) -SELECT distinct(group_id), 'include_folder_perimeter' FROM usergroups_services; +SELECT distinct(group_id), 'include_folders_and_followed_resources_perimeter' FROM usergroups_services; UPDATE groupbasket SET list_event_data = '{"canUpdateDocument":true}' WHERE list_event = 'signatureBookAction' AND group_id in ( diff --git a/sql/data_fr.sql b/sql/data_fr.sql index 1d99ae44c1adc723dff33c6cd66726dc6b55d3e7..69ffc517a758e98e214c24893d2453abae0fedca 100755 --- a/sql/data_fr.sql +++ b/sql/data_fr.sql @@ -67,6 +67,7 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'priv INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', '_print_sep'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'physical_archive_print_sep_mlb'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'manage_numeric_package'); +INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'include_folders_and_followed_resources_perimeter'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'adv_search_mlb'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'create_contacts'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'update_contacts'); @@ -87,6 +88,7 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'config_ INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'config_avis_workflow_in_detail'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'private_tag'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'manage_numeric_package'); +INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'include_folders_and_followed_resources_perimeter'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'adv_search_mlb'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'create_contacts'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'update_contacts'); @@ -107,6 +109,7 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'print_folder_doc'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'private_tag'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'manage_numeric_package'); +INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'include_folders_and_followed_resources_perimeter'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'adv_search_mlb'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'create_contacts'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'update_contacts'); @@ -131,6 +134,7 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'c INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'avis_documents'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'private_tag'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'manage_numeric_package'); +INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'include_folders_and_followed_resources_perimeter'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'adv_search_mlb'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_users'); @@ -182,15 +186,18 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'physical_archive_print_sep_mlb'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'physical_archive_batch_manage'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_life_cycle'); +INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'include_folders_and_followed_resources_perimeter'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N2', 'admin'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N2', 'view_doc_history'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N2', 'view_full_history'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N2', 'edit_resource'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N2', 'admin_templates'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N2', 'admin_tag'); +INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N2', 'include_folders_and_followed_resources_perimeter'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ELU', 'sign_document'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ELU', 'visa_documents'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ELU', 'avis_documents'); +INSERT INTO usergroups_services (group_id, service_id) VALUES ('ELU', 'include_folders_and_followed_resources_perimeter'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ARCHIVISTE', 'adv_search_mlb'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ARCHIVISTE', 'create_contacts'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ARCHIVISTE', 'update_contacts'); @@ -200,6 +207,7 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('ARCHIVISTE', 'vi INSERT INTO usergroups_services (group_id, service_id) VALUES ('ARCHIVISTE', 'sendmail'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ARCHIVISTE', 'avis_documents'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('ARCHIVISTE', 'export_seda_view'); +INSERT INTO usergroups_services (group_id, service_id) VALUES ('ARCHIVISTE', 'include_folders_and_followed_resources_perimeter'); INSERT INTO usergroups_services (group_id, service_id) VALUES ('MAARCHTOGEC', 'manage_numeric_package'); -- Create DOCTYPES diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php index 7c3d90e0a940f7f5a91d55059e72fddc7ab6978f..0132c6e820dcfd7270fcd46f1b3d082579a2feaa 100755 --- a/src/app/folder/controllers/FolderController.php +++ b/src/app/folder/controllers/FolderController.php @@ -747,7 +747,7 @@ class FolderController 'listDisplay' => ['folders'] ]); - $folderPrivilege = PrivilegeController::hasPrivilege(['privilegeId' => 'include_folder_perimeter', 'userId' => $GLOBALS['id']]); + $folderPrivilege = PrivilegeController::hasPrivilege(['privilegeId' => 'include_folders_and_followed_resources_perimeter', 'userId' => $GLOBALS['id']]); foreach ($formattedResources as $key => $formattedResource) { if ($folderPrivilege) { $formattedResources[$key]['allowed'] = true; diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index 489e3d9246c68eb38a1847ce1b9bc27e2e6b447e..5f3ec01ab7681e44fe00949e6e34212419aa22c5 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -1017,7 +1017,7 @@ class ResController extends ResourceControlController return $args['resources']; } - $folder = PrivilegeController::hasPrivilege(['privilegeId' => 'include_folder_perimeter', 'userId' => $args['userId']]); + $folder = PrivilegeController::hasPrivilege(['privilegeId' => 'include_folders_and_followed_resources_perimeter', 'userId' => $args['userId']]); $data = [$args['resources']]; if ($folder) { diff --git a/src/app/resource/controllers/UserFollowedResourceController.php b/src/app/resource/controllers/UserFollowedResourceController.php index 41e89ac3945c0e4c12b118084592c544b3925577..263651bdcfd8b3a28cc9030beefa02f2417f198a 100644 --- a/src/app/resource/controllers/UserFollowedResourceController.php +++ b/src/app/resource/controllers/UserFollowedResourceController.php @@ -154,7 +154,7 @@ class UserFollowedResourceController 'listDisplay' => ['folders'] ]); - $folderPrivilege = PrivilegeController::hasPrivilege(['privilegeId' => 'include_folder_perimeter', 'userId' => $GLOBALS['id']]); + $folderPrivilege = PrivilegeController::hasPrivilege(['privilegeId' => 'include_folders_and_followed_resources_perimeter', 'userId' => $GLOBALS['id']]); foreach ($formattedResources as $key => $formattedResource) { if ($folderPrivilege) { $formattedResources[$key]['allowed'] = true; diff --git a/src/frontend/service/privileges.service.ts b/src/frontend/service/privileges.service.ts index cd0fe65c8e8c4523f1f5d1b0bbc344186cf29280..ef0b0ac2cbd75da1db69550da3be84a914f503d6 100755 --- a/src/frontend/service/privileges.service.ts +++ b/src/frontend/service/privileges.service.ts @@ -465,7 +465,7 @@ export class PrivilegeService { 'unit': 'confidentialityAndSecurity' }, { - 'id': 'include_folder_perimeter', + 'id': 'include_folders_and_followed_resources_perimeter', 'label': this.lang.includeFolderPerimeter, 'comment': this.lang.includeFolderPerimeter, 'unit': 'application'