From 1c8b12edc36c6472658ff1cdcadd3d159d57375f Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 17 Feb 2020 17:48:23 +0100
Subject: [PATCH] FEAT #13049 TIME 0:05 removed action
---
core/xml/actions_pages.xml | 13 -------------
.../action/controllers/ActionMethodController.php | 12 ------------
src/core/lang/lang-en.php | 2 --
src/core/lang/lang-fr.php | 3 +--
src/core/lang/lang-nl.php | 2 --
5 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/core/xml/actions_pages.xml b/core/xml/actions_pages.xml
index 98867d30531..cfa85089cca 100755
--- a/core/xml/actions_pages.xml
+++ b/core/xml/actions_pages.xml
@@ -422,17 +422,4 @@ An action page is described in a ACTIONPAGE tag :
<MODULE></MODULE>
<FLAG_CREATE>false</FLAG_CREATE>
</ACTIONPAGE>
- <ACTIONPAGE>
- <ID>close_mail_with_fields</ID>
- <LABEL>_CLOSE_MAIL_WITH_FIELDS</LABEL>
- <NAME>close_mail_with_fields</NAME>
- <DESC>_CLOSE_MAIL_WITH_FIELDS_DESC</DESC>
- <component>closeWithFieldsAction</component>
- <ORIGIN>apps</ORIGIN>
- <MODULE></MODULE>
- <FLAG_CREATE>false</FLAG_CREATE>
- <COLLECTIONS>
- <COLL_ID>letterbox_coll</COLL_ID>
- </COLLECTIONS>
- </ACTIONPAGE>
</ROOT>
diff --git a/src/app/action/controllers/ActionMethodController.php b/src/app/action/controllers/ActionMethodController.php
index 28e3cf7880e..8a34efe75b1 100644
--- a/src/app/action/controllers/ActionMethodController.php
+++ b/src/app/action/controllers/ActionMethodController.php
@@ -66,7 +66,6 @@ class ActionMethodController
'continueOpinionCircuitAction' => 'continueOpinionCircuit',
'giveOpinionParallelAction' => 'giveOpinionParallel',
'validateParallelOpinionDiffusionAction' => 'validateParallelOpinionDiffusion',
- 'closeWithFieldsAction' => 'closeWithFields',
'noConfirmAction' => null
];
@@ -883,15 +882,4 @@ class ActionMethodController
return true;
}
-
- public static function closeWithFields(array $args)
- {
- ValidatorModel::notEmpty($args, ['resId']);
- ValidatorModel::intVal($args, ['resId']);
- ValidatorModel::stringType($args, ['note']);
-
- ResModel::update(['set' => ['closing_date' => 'CURRENT_TIMESTAMP'], 'where' => ['res_id = ?', 'closing_date is null'], 'data' => [$args['resId']]]);
-
- return true;
- }
}
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index 964ee43761f..8a7332b512b 100755
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -227,8 +227,6 @@ define('_NO_CONFIRM_DESC', "Perform the action without confirmation");
define('_VIEW_DOC', 'See the mail');
define('_CLOSE_MAIL', 'Close a mail');
define('_CLOSE_MAIL_DESC', 'Allows you to update the closing date of a mail. ESSENTIAL in order to complete your document workflow.');
-define('_CLOSE_MAIL_WITH_FIELDS', 'Close a mail with custom fields');
-define('_CLOSE_MAIL_WITH_FIELDS_DESC', 'Allows you to update the closing date of a mail. ESSENTIAL in order to complete your document workflow. Chosen fields will be needed to do the action.');
define('_SET_PERSISTENT_MODE_ON', 'Activate the persistence');
define('_SET_PERSISTENT_MODE_ON_DESC', 'Keeps a mail in a basket regardless of its state. Insert data in the \'basket_persistent_mode\' table.');
define('_SET_PERSISTENT_MODE_OFF', 'Deactivate the persistence');
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index edae0660412..662682ec067 100755
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -154,6 +154,7 @@ define('_TAG_DELETED', 'Mot-clé supprimé');
define('_TAG_UPDATED', 'Mot-clé modifié');
define('_TAG_MERGED', 'Mot-clé fusionné');
define('_LINK_ADDED', 'Liaison ajoutée');
+define('_LINK_DELETED', 'Liaison supprimée');
define('_DOCUMENT_SIGNED', 'Document signé');
define('_DOCUMENT_UNSIGNED', 'Document dé-signé');
define('_LINK_ADDED_TAG', 'Liaison de mot-clé ajoutée');
@@ -227,8 +228,6 @@ define('_NO_CONFIRM_DESC', "Effectue l'action sans confirmation");
define('_VIEW_DOC', 'Voir le courrier');
define('_CLOSE_MAIL', 'Clôturer un courrier');
define('_CLOSE_MAIL_DESC', 'Permet de mettre à jour la date de clôture d\'un courrier. ESSENTIEL afin de terminer votre workflow de courrier.');
-define('_CLOSE_MAIL_WITH_FIELDS', 'Clôturer un courrier avec des champs personnalisés');
-define('_CLOSE_MAIL_WITH_FIELDS_DESC', 'Permet de mettre à jour la date de clôture d\'un courrier. ESSENTIEL afin de terminer votre workflow de courrier. L\'action ne pourra se faire seulement si les champs choisis sont renseignés dans le courrier');
define('_SET_PERSISTENT_MODE_ON', 'Activer la persistance');
define('_SET_PERSISTENT_MODE_ON_DESC', 'Permet de conserver un courrier dans une bannette quelque soit son état. Insère la donnée dans la table \'basket_persistent_mode\'.');
define('_SET_PERSISTENT_MODE_OFF', 'Désactiver la persistance');
diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php
index 2d1f1c58989..b8419c7c614 100755
--- a/src/core/lang/lang-nl.php
+++ b/src/core/lang/lang-nl.php
@@ -228,8 +228,6 @@ define('_NO_CONFIRM_DESC', "Perform the action without confirmation"); //_TO_TRA
define('_VIEW_DOC', 'Het brief bekijken');
define('_CLOSE_MAIL', 'Een brief afsluiten');
define('_CLOSE_MAIL_DESC', 'Om de afsluitingsdatum van een brief bij te werken. ESSENTIEEL om uw documentworkflow af te sluiten.');
-define('_CLOSE_MAIL_WITH_FIELDS', 'Close a mail with custom fields'); //_TO_TRANSLATE
-define('_CLOSE_MAIL_WITH_FIELDS_DESC', 'Allows you to update the closing date of a mail. ESSENTIAL in order to complete your document workflow. Chosen fields will be needed to do the action.'); //_TO_TRANSLATE
define('_SET_PERSISTENT_MODE_ON', 'De persistentie activeren');
define('_SET_PERSISTENT_MODE_ON_DESC', 'Om een biref in een bakje te bewaren ongeacht zijn status. Voegt het gegeven in de tabel \basket_persistent_mode\.');
define('_SET_PERSISTENT_MODE_OFF', 'De persistentie uitschakelen');
--
GitLab