From f8b6853ab1255b24804dd9b8fdff7d7972e614f6 Mon Sep 17 00:00:00 2001
From: Tiago Mello <timello@gmail.com>
Date: Fri, 18 Nov 2011 15:35:55 -0200
Subject: Bug 643411: New default bug limit makes time summary results
 confusing r/a=mkanat

---
 template/en/default/list/list.html.tmpl | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'template/en/default')

diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 28540cdc0..29b0532d0 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -187,6 +187,14 @@
             <input type="hidden" name="id" value="[% buglist_joined FILTER html %]">
             <input type="submit" id="timesummary" value="Time Summary">
           </form>
+          [% IF time_summary_limited %]
+            <small>
+              Time Summary will only include the bugs shown above. In order to
+              to see a time summary for all bugs found by the search, you can 
+              <a href="buglist.cgi?[% urlquerypart FILTER html %]
+                       [%- "&order=$qorder" FILTER html IF order %]&limit=0">
+                Show all search results</a>.</small>
+          [% END %]
         [% END %]
       </td>
       
@@ -296,6 +304,7 @@
       <a href="buglist.cgi?[% urlquerypart FILTER html %]
               [%- "&order=$qorder" FILTER html IF order %]&limit=0">See
         all search results for this query</a>.
+      [% time_summary_limited = 1 %]
     [% ELSIF bugs.size == 1 %]
       One [% terms.bug %] found.
     [% ELSE %]
-- 
cgit v1.2.3-24-g4f1b


From 242862cac73f0537e8b92f9bf6841c0e3179cf2b Mon Sep 17 00:00:00 2001
From: Tiago Mello <timello@gmail.com>
Date: Fri, 18 Nov 2011 15:52:49 -0200
Subject: Fix bustage due to bug 643411.

---
 template/en/default/list/list.html.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 29b0532d0..27d1eb027 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -189,8 +189,8 @@
           </form>
           [% IF time_summary_limited %]
             <small>
-              Time Summary will only include the bugs shown above. In order to
-              to see a time summary for all bugs found by the search, you can 
+              Time Summary will only include the [% terms.bugs %] shown above. In order to
+              to see a time summary for all [% terms.bugs %] found by the search, you can
               <a href="buglist.cgi?[% urlquerypart FILTER html %]
                        [%- "&order=$qorder" FILTER html IF order %]&limit=0">
                 Show all search results</a>.</small>
-- 
cgit v1.2.3-24-g4f1b


From 4d99c123ee568e5a548968de8417ebc70a24efe4 Mon Sep 17 00:00:00 2001
From: Reed Loden <reed@reedloden.com>
Date: Mon, 21 Nov 2011 14:08:54 -0800
Subject: Bug 703983 - CSRF vulnerability in attachment.cgi allows possible
 unauthorized attachment creation [r=LpSolit a=LpSolit]

---
 .../attachment/cancel-create-dupe.html.tmpl        | 48 ----------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 template/en/default/attachment/cancel-create-dupe.html.tmpl

(limited to 'template/en/default')

diff --git a/template/en/default/attachment/cancel-create-dupe.html.tmpl b/template/en/default/attachment/cancel-create-dupe.html.tmpl
deleted file mode 100644
index 643a24ad8..000000000
--- a/template/en/default/attachment/cancel-create-dupe.html.tmpl
+++ /dev/null
@@ -1,48 +0,0 @@
-[%# The contents of this file are subject to the Mozilla Public
-  # License Version 1.1 (the "License"); you may not use this file
-  # except in compliance with the License. You may obtain a copy of
-  # the License at http://www.mozilla.org/MPL/
-  #
-  # Software distributed under the License is distributed on an "AS
-  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  # implied. See the License for the specific language governing
-  # rights and limitations under the License.
-  #
-  # The Original Code is the Bugzilla Bug Tracking System.
-  #
-  # The Initial Developer of the Original Code is Olav Vitters.
-  #
-  # Contributor(s): Olav Vitters <olav@bkor.dhs.org>
-  #                 David Lawrence <dkl@redhat.com>
-  #%]
-
-[%# INTERFACE:
-  # bugid:    integer. ID of the bug report that this attachment relates to.
-  # attachid: integer. ID of the previous attachment recently created.
-  #%]
-
-[% PROCESS "global/field-descs.none.tmpl" %]
-
-[% PROCESS global/header.html.tmpl
-  title = "Already filed attachment"
-%]
-
-[% USE Bugzilla %]
-
-<table cellpadding="20">
-  <tr>
-    <td bgcolor="#ff0000">
-      <font size="+2">
-        You already used the form to file
-        <a href="[% urlbase FILTER html %]attachment.cgi?id=[% attachid FILTER uri %]&action=edit">attachment [% attachid FILTER uri %]</a>.
-      </font>
-    </td>
-  </tr>
-</table>
-
-<p>
-  You can either <a href="[% urlbase FILTER html %]attachment.cgi?bugid=[% bugid FILTER uri %]&action=enter">
-  create a new attachment</a> or [% "go back to $terms.bug $bugid" FILTER bug_link(bugid) FILTER none %].
-<p>
-
-[% PROCESS global/footer.html.tmpl %]
-- 
cgit v1.2.3-24-g4f1b