Mercurial > p > roundup > code
changeset 6072:3174e98a3e51
issue2550912: Jinja2 template needs fixing of value for __came_from
| author | Christof Meerwald <cmeerw@cmeerw.org> |
|---|---|
| date | Wed, 29 Jan 2020 20:00:52 +0000 |
| parents | f13f4db597d4 |
| children | 6106ff259756 |
| files | CHANGES.txt share/roundup/templates/jinja2/html/layout/navigation.html |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGES.txt Wed Jan 29 19:44:46 2020 +0000 +++ b/CHANGES.txt Wed Jan 29 20:00:52 2020 +0000 @@ -88,6 +88,8 @@ for translations. (Report: John Rouillard; Fix: Christof Meerwald) - Cleanup code by linting using flake8. (John Rouillard) - Cleanup code by security linting using bandit. (John Rouillard) +- issue2550912 - fixed missing query string in __came_from for jinja2 + template. (Christof Meerwald) 2019-10-23 2.0.0 alpha 0
--- a/share/roundup/templates/jinja2/html/layout/navigation.html Wed Jan 29 19:44:46 2020 +0000 +++ b/share/roundup/templates/jinja2/html/layout/navigation.html Wed Jan 29 20:00:52 2020 +0000 @@ -140,7 +140,7 @@ </li> </ul> <input type="hidden" name="@action" value="Login"> - <input type="hidden" name="__came_from" value='{{request.base}}{{request.env.PATH_INFO}}'> + <input type="hidden" name="__came_from" value="{{ request.base }}{{ request.env.PATH_INFO }}{% if request.env.QUERY_STRING %}?{{ request.env.QUERY_STRING }}{% endif %}"> </form> <hr> {% else %}