issue2550912: Jinja2 template needs fixing of value for __came_from

Author: cmeerw

CHANGES.txt

@@ -88,6 +88,8 @@ Fixed:
   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
 

share/roundup/templates/jinja2/html/layout/navigation.html

@@ -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 %}