diff --git a/mouvements/output_return.html b/mouvements/output_return.html index 941d2c6..d3d688d 100644 --- a/mouvements/output_return.html +++ b/mouvements/output_return.html @@ -160,7 +160,11 @@ temp_key=$_GET.key return=$mvt_key }} - {{:redirect force="../historique.html?ok=1&key=%s&prop=1&msg=retour"|args:$mvt_new.equipment}} + {{if $_GET.user == null}} + {{:redirect force="../historique.html?ok=1&key=%s&prop=1&msg=retour"|args:$mvt_new.equipment}} + {{else}} + {{:redirect force="/admin/users/details.php?id=%s"|args:$_GET.user}} + {{/if}} {{/if}} {{/form}} diff --git a/snippets/user_details.html b/snippets/user_details.html index 5d42787..b93a6f3 100644 --- a/snippets/user_details.html +++ b/snippets/user_details.html @@ -67,7 +67,7 @@ {{if $direction == "output" && $type_mvt == "temporaire"}} {{:linkbutton label="Retour" - href="%smouvements/output_return.html?key=%s&prop=0"|args:$module.url:$mvt_key + href="%smouvements/output_return.html?key=%s&prop=0&user=%s"|args:$module.url:$mvt_key:$user.id shape="history" target="_dialog"}} {{/if}}