From 2c804b1457cf54615f2cb20a1ae7a0a629d5cd5c Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 6 Nov 2010 09:09:09 +0000
Subject: [PATCH] Merged [2610] from rjsparks@nostrum.com: Retained search
results on login:
* Changed the two search controls to use get instead of put
* Populated the Sign In link's next argument with the full URL path.
Fixes #482.
- Legacy-Id: 2629
Note: SVN reference [2610] has been migrated to Git commit 96faec1e328f19ac8a326f95c59cad0f63fe1492
---
ietf/templates/base.html | 2 +-
ietf/templates/base_leftmenu.html | 2 +-
ietf/templates/idrfc/search_form.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index 9b07c3fb7..5da8a3230 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -63,7 +63,7 @@ IETF.user_groups = { {% for group in user.groups.all %}"{{group}}":true{% if not
<div id="ietf-login" class="noprint">{% if user.is_authenticated %}
{{ user }}
{% else %}
-<a href="/accounts/login/?next={{request.path|urlencode}}" rel="nofollow">Sign In</a>
+<a href="/accounts/login/?next={{request.get_full_path|urlencode}}" rel="nofollow">Sign In</a>
{% endif %}</div>
<table style="margin-left:8px;margin-top:8px;" width="98%;">
diff --git a/ietf/templates/base_leftmenu.html b/ietf/templates/base_leftmenu.html
index a54a89c8d..97d18ca3b 100644
--- a/ietf/templates/base_leftmenu.html
+++ b/ietf/templates/base_leftmenu.html
@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<li class="sect">Drafts & RFCs</li>
<li><a href="/doc/">Search</a></li>
- <li><form action="/doc/search/" method="post" style="padding-bottom:0;margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name" /><input type="hidden" name="activeDrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>
+ <li><form action="/doc/search/" method="get" style="padding-bottom:0;margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name" /><input type="hidden" name="activeDrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>
<li><a href="https://datatracker.ietf.org/idst/upload.cgi">Submit a draft</a></li>
diff --git a/ietf/templates/idrfc/search_form.html b/ietf/templates/idrfc/search_form.html
index b67bc29ea..f386c216f 100644
--- a/ietf/templates/idrfc/search_form.html
+++ b/ietf/templates/idrfc/search_form.html
@@ -32,7 +32,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% endcomment %}
-<form name="search_form" id="search_form" class="search_form" action="/doc/search/" method="post" {# onsubmit="submitSearch();return false;" #}>
+<form name="search_form" id="search_form" class="search_form" action="/doc/search/" method="get" {# onsubmit="submitSearch();return false;" #}>
<div class="search_field">
<label>Name/number/title:</label> {{ form.name }}