From a3b0a94e697ed4478cde8de2fb22e9545dc41c8e Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Tue, 28 Aug 2012 23:22:11 +0800
Subject: Bug 772953: Remove the token from buglist urls r=dkl, a=LpSolit

---
 template/en/default/list/list.html.tmpl              |  3 +++
 template/en/default/search/search-advanced.html.tmpl | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'template/en')

diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 1dfdf51c2..1c5c22810 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -38,6 +38,9 @@
         &list_id=[% cgi.param('list_id') FILTER uri %]
       [%~ END %]
     [% END %]
+  [% ELSIF cgi.param('token') != '' %]
+    [% new_url = 'buglist.cgi?'
+                 _ cgi.canonicalise_query('token', 'cmdtype', 'remtype') %]
   [% END %]
 
   if (history && history.replaceState) {
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index 7b2a347b9..2bff834bc 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -15,10 +15,19 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
+[% javascript = BLOCK %]
+function remove_token() {
+  if (queryform.token) {
+    var asDefault = document.getElementById('remasdefault');
+    queryform.token.disabled = !asDefault.checked;
+  }
+}
+[% END %]
 
 [% PROCESS global/header.html.tmpl
   title = "Search for $terms.bugs"
   yui = [ 'autocomplete', 'calendar' ]
+  javascript = javascript
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js"]
   style_urls = [ "skins/standard/search_form.css" ]
   doc_section = "query.html"
@@ -30,7 +39,8 @@
 
 <p id="search_help">Hover your mouse over each field label to get help for that field.</p>
 
-<form method="post" action="buglist.cgi" name="queryform" id="queryform">
+<form method="post" action="buglist.cgi" name="queryform" id="queryform"
+      onsubmit="remove_token()">
 
 [% PROCESS search/form.html.tmpl %]
 
-- 
cgit v1.2.1