diff --git a/core/xml/actions_pages.xml b/core/xml/actions_pages.xml index 98867d305312d61a6f90d939b0e7493b76200401..cfa85089cca9bda8213be6f10a018e96f1586e0b 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 28e3cf7880e4f60e66f1c1b0d4aee703f5dcd17f..8a34efe75b19c4a04869576fbae5d0ab6d098994 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 964ee43761fcd62da3a2b730022455e6378bd6b6..8a7332b512b176f79bac52bd9f54f665803d3c64 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 edae0660412162e97e565b260e8f92f4987fa8be..662682ec0679b6c908baef4bed1e7868b2585b08 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 2d1f1c58989cd5fa7b3a31605fc3f6b58cee4d12..b8419c7c61481a935dd42618a10c3ec1177979c4 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');