diff --git a/modules/export_seda/export_seda.php b/modules/export_seda/export_seda.php index 68a2e4faf8d354c28890f077b110479cdf62f514..2fef3784aeea634cc7835e5c76f69f972f7c33f5 100755 --- a/modules/export_seda/export_seda.php +++ b/modules/export_seda/export_seda.php @@ -99,7 +99,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module, } //$config = parse_ini_file(__DIR__.'/config.ini'); - $frm_str .= '<div align="center" name="valid" id="valid" style="display: none "><br><input type="button" class="button" name="validateReload" id="validateReload" value="'._VALIDATE.'" onclick="window.location.reload()"/></div>'; + $frm_str .= '<div align="center" name="valid" id="valid" style="display: none "><br><input type="button" class="button" name="validateReload" id="validateReload" value="'._VALIDATE.'" onclick="triggerAngular(\'#/basketList/users/'.$_SESSION['urlV2Basket']['userId'].'/groups/'.$_SESSION['urlV2Basket']['groupIdSer'].'/baskets/'.$_SESSION['urlV2Basket']['basketId'].'\');"/></div>'; $frm_str .= '<hr />'; $frm_str .= '<div align="center">'; diff --git a/modules/export_seda/js/functions.js b/modules/export_seda/js/functions.js index 9021a124b440c322db3231d43c1132cea6346393..ce6fc25be1cbfd31ef54e1cc671faf1c1820b073 100755 --- a/modules/export_seda/js/functions.js +++ b/modules/export_seda/js/functions.js @@ -57,7 +57,7 @@ function actionSeda(path,type) { ); } -function actionValidation(path,type) { +function actionValidation(path, aUrlBasket) { new Ajax.Request(path, { method:'post', @@ -69,7 +69,7 @@ function actionValidation(path,type) { } else { alert(response.error); } - location.reload(); + triggerAngular('#/basketList/users/' + aUrlBasket['userId'] + '/groups/' + aUrlBasket['groupIdSer'] + '/baskets/' + aUrlBasket['basketId']); } }); } diff --git a/modules/export_seda/purge_letter.php b/modules/export_seda/purge_letter.php index 5f898ecd6de86c6129601298f8224c878388f8e6..8166ebebbfbfeddb0a5e2ee39bc5978de47d881a 100755 --- a/modules/export_seda/purge_letter.php +++ b/modules/export_seda/purge_letter.php @@ -61,7 +61,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $frm_str .='</form>'; $frm_str .='</div>'; $frm_str .='<div align="center">'; - $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=purge&reference='.$values_str.'\');" />'; + $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=purge&reference='.$values_str.'\', '. $_SESSION['urlV2Basket'] .');" />'; $frm_str .=' <input type="button" name="cancel" id="cancel" class="button" value="'._CANCEL.'" onclick="pile_actions.action_pop();actions_status.action_pop();destroyModal(\'modal_'.$id_action.'\');"/>'; $frm_str .='</div>'; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 239faf359303a904132927ea1e7b5cbd974bf2a7..3eba3e1263023f89d2c3ff4134ca5942969b6a4e 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -82,8 +82,8 @@ export const LANG_FR = { "arAlreadyGenerated" : "accusé(s) de réception déjà généré(s)", "arAlreadySend" : "accusé(s) de réception déjà envoyé(s)", "archival" : "Archivage", - "archivalAgency" : "Convention d'archivage", - "archivalAgreement" : "Service d'archive", + "archivalAgency" : "Service d'archive", + "archivalAgreement" : "Accord de versement", "arrivalDate" : "Date d'arrivée", "ascending" : "Ascendant", "ascOrder" : "Ordre ascendant", @@ -344,7 +344,7 @@ export const LANG_FR = { "downloadOriginalFile" : "Télécharger le fichier original", "draft" : "Brouillon", "duplicate" : "Dupliquer", - "durationCurrentUse" : "Durée d'utilité courante (en j)", + "durationCurrentUse" : "Durée d'utilité courante (en mois)", "eachDay" : "Chaque jour", "eachHour" : "Toutes les heures", "eachMinute" : "Toutes les minutes",