diff --git a/mouvements/entrees/index.html b/mouvements/entrees/index.html index f3b1ce4..051b3b6 100644 --- a/mouvements/entrees/index.html +++ b/mouvements/entrees/index.html @@ -65,7 +65,7 @@ target="_dialog"}} {{:linkbutton label="Modifier" - href="../modifier_mouvement.html?key=%s&direction=input&caller=%s"|args:$mvt_key:$request_url + href="../modifier_mouvement.html?key=%s&direction=input"|args:$mvt_key shape="edit" target="_dialog"}} diff --git a/mouvements/modifier_mouvement.html b/mouvements/modifier_mouvement.html index 3c587ab..58b52d2 100644 --- a/mouvements/modifier_mouvement.html +++ b/mouvements/modifier_mouvement.html @@ -1,13 +1,6 @@ {{#restrict section="config" level="admin" block=true}}{{/restrict}} {{:admin_header title="Modifier une %s"|args:$_GET.direction current="module_equipment"}} -{{* déterminer l'url de retour *}} -{{:assign url=$_GET.caller}} -{{:assign pos=$url|strpos:"?"}} -{{if $pos|intval > 0}} - {{:assign url=$url|truncate:$pos:"":true}} -{{/if}} - {{:assign direction=$_GET.direction}} {{:assign key_mvt=$_GET.key}} @@ -18,8 +11,10 @@ {{/load}} {{if $direction == "input"}} {{:assign input_init=$mvt_modif.input_nature}} + {{:assign url="entrees/index.html"}} {{else}} {{:assign output_init=$mvt_modif.output_nature}} + {{:assign url="sorties/index.html"}} {{/if}} {{:assign amount_init=$mvt_modif.amount}} {{:assign date_init=$mvt_modif.date|date_short}} diff --git a/mouvements/sorties/index.html b/mouvements/sorties/index.html index 5b49c1a..21dc70c 100644 --- a/mouvements/sorties/index.html +++ b/mouvements/sorties/index.html @@ -64,7 +64,7 @@ target="_dialog"}} {{:linkbutton label="Modifier" - href="../modifier_mouvement.html?key=%s&direction=output&caller=%s"|args:$mvt_key:$request_url + href="../modifier_mouvement.html?key=%s&direction=output"|args:$mvt_key shape="edit" target="_dialog"}}