From 0c0a23049cc7d7d27bb68d821ab45d66454ff07b Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 8 Oct 2019 16:32:40 +0200
Subject: [PATCH] FEAT #11274 TIME 0:20 Refactor old services
---
modules/entities/xml/services.xml | 24 ------------------------
sql/data_en.sql | 5 +++--
sql/data_fr.sql | 20 ++++++++++----------
src/core/lang/lang-en.php | 2 --
src/core/lang/lang-fr.php | 2 --
src/core/lang/lang-nl.php | 2 --
6 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/modules/entities/xml/services.xml b/modules/entities/xml/services.xml
index 62845964a5d..3912ed6478c 100755
--- a/modules/entities/xml/services.xml
+++ b/modules/entities/xml/services.xml
@@ -102,30 +102,6 @@
<nature>include</nature>
</WHEREAMIUSED>
</SERVICE>
- <SERVICE>
- <id>edit_recipient_outside_process</id>
- <name>_EDIT_RECIPIENT_OUTSIDE_PROCESS</name>
- <servicepage>load_listinstance.php</servicepage>
- <servicetype>use</servicetype>
- <system_service>false</system_service>
- <enabled>true</enabled>
- <WHEREAMIUSED>
- <page>load_listinstance</page>
- <nature>include</nature>
- </WHEREAMIUSED>
- </SERVICE>
- <SERVICE>
- <id>update_list_diff_in_details</id>
- <name>_UPDATE_LIST_DIFF_IN_DETAILS</name>
- <servicepage>add_copy_in_process.php</servicepage>
- <servicetype>use</servicetype>
- <system_service>false</system_service>
- <enabled>true</enabled>
- <WHEREAMIUSED>
- <page>details</page>
- <nature>include</nature>
- </WHEREAMIUSED>
- </SERVICE>
<SERVICE>
<id>entities_print_sep_mlb</id>
<name>_ENTITIES_PRINT_SEP_MLB</name>
diff --git a/sql/data_en.sql b/sql/data_en.sql
index c6569915075..8766f43d733 100644
--- a/sql/data_en.sql
+++ b/sql/data_en.sql
@@ -53,9 +53,9 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'prin
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'print_doc_details_from_list');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'delete_document_in_detail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'edit_document_in_detail');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'update_list_diff_in_details');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'entities_print_sep_mlb');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'edit_recipient_outside_process');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'update_diffusion_recipient_indexing');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'update_diffusion_recipient_details');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'sendmail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'use_mail_services');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'reports');
@@ -86,6 +86,7 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'update_
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'sendmail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'use_mail_services');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'edit_attachments_from_detail');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'update_diffusion_recipient_indexing');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'edit_recipient_outside_process');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'modify_attachments');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'delete_attachments');
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index f759c196d79..f913e1a7328 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -53,8 +53,8 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'prin
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'print_doc_details_from_list');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'delete_document_in_detail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'edit_document_in_detail');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'edit_recipient_outside_process');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'update_list_diff_in_details');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'update_diffusion_recipient_indexing');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'update_diffusion_recipient_details');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'entities_print_sep_mlb');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'sendmail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('COURRIER', 'use_mail_services');
@@ -83,8 +83,8 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'view_do
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'add_links');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'print_details');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'print_doc_details_from_list');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'edit_recipient_outside_process');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'update_list_diff_in_details');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'update_diffusion_recipient_indexing');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'update_diffusion_recipient_details');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'sendmail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'use_mail_services');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('AGENT', 'edit_attachments_from_detail');
@@ -116,8 +116,8 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER',
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'print_doc_details_from_list');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'delete_document_in_detail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'edit_document_in_detail');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'edit_recipient_outside_process');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'update_list_diff_in_details');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'update_diffusion_recipient_indexing');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'update_diffusion_recipient_details');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'sendmail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'use_mail_services');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESP_COURRIER', 'reports');
@@ -140,8 +140,8 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'v
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'add_links');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'print_details');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'print_doc_details_from_list');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'edit_recipient_outside_process');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'update_list_diff_in_details');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'update_diffusion_recipient_indexing');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'update_diffusion_recipient_details');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'sendmail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'use_mail_services');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'reports');
@@ -198,8 +198,8 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N
INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'manage_entities');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_difflist_types');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_listmodels');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'edit_recipient_outside_process');
-INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'update_list_diff_in_details');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'update_diffusion_recipient_indexing');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'update_diffusion_recipient_details');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'entities_print_sep_mlb');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'sendmail');
INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'use_mail_services');
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index 429ab1d4e70..f41df00aec7 100755
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -350,8 +350,6 @@ define("_AVIS_ANSWERS", "Give oneself's opinion");
define("_AVIS_ANSWERS_DESC", "Allows to this group to appear in the counsellor's list (recommendation workflow)");
define("_VIEW_BASKETS_DESC", "My baskets");
define('_CHOOSE_ENTITY', 'Choose a department');
-define('_EDIT_RECIPIENT_OUTSIDE_PROCESS', 'Edit recipient on the diffusion list');
-define('_UPDATE_LIST_DIFF_IN_DETAILS', 'Update diffusion list from the detailed page');
define('_ENTITIES_PRINT_SEP_MLB', 'Print limiters by department/services');
define("_EXPORT_SEDA_VIEW", "See message export");
define("_SEND_DOCS_TO_RECOMMENDATION", "Sent a recommendation request (parallel)");
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index 2c60dfcf43b..d293823fa8c 100755
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -350,8 +350,6 @@ define("_AVIS_ANSWERS", "Donner son avis");
define("_AVIS_ANSWERS_DESC", "Permet à ce groupe d'apparaître dans la liste des personnes Conseillers (circuit d'avis)");
define("_VIEW_BASKETS_DESC", "Mes bannettes");
define('_CHOOSE_ENTITY', 'Choisissez une entité');
-define('_EDIT_RECIPIENT_OUTSIDE_PROCESS', "Modifier l'attributaire dans la liste de diffusion (hors traitement)");
-define('_UPDATE_LIST_DIFF_IN_DETAILS', 'Mettre à jour la liste de diffusion depuis la fiche détaillée');
define('_ENTITIES_PRINT_SEP_MLB', 'Impression des séparateurs');
define('_EXPORT_SEDA_VIEW', 'Voir le bordereau');
define('_SEND_DOCS_TO_RECOMMENDATION', 'Envoyer une demande d\'avis (parallèle)');
diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php
index 86710dae6ef..aa199b51da0 100755
--- a/src/core/lang/lang-nl.php
+++ b/src/core/lang/lang-nl.php
@@ -348,8 +348,6 @@ define('_AVIS_ANSWERS', 'Zijn mening geven');
define('_AVIS_ANSWERS_DESC', 'Laat deze groep verschijnen in de lijst van de Consultants (berichtencircuit)');
define('_VIEW_BASKETS_DESC', 'Mijn bakjes');
define('_CHOOSE_ENTITY', 'Kies een eenheid');
-define('_EDIT_RECIPIENT_OUTSIDE_PROCESS', '_TO_TRANSLATE in de verdelingslijst verbieden');
-define('_UPDATE_LIST_DIFF_IN_DETAILS', 'De verdelingslijst vanuit de detailpagina’s updaten');
define('_ENTITIES_PRINT_SEP_MLB', 'De separatoren per dienst afdrukken');
define('_EXPORT_SEDA_VIEW', 'Zie het borderel');
define('_SEND_DOCS_TO_RECOMMENDATION', 'Een (parallelle) berichtenvraag verzenden');
--
GitLab