From 1730c8487ecac8d48bc7399ceb331e8cca993f2e Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 12 Oct 2012 22:00:14 +0000
Subject: [PATCH] Bug 791554: Make clear that 0 is a valid sortkey for
 flagtypes r/a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@264329 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                             | 2 +-
 .../template/en/default/admin/flag-type/edit.html.tmpl        | 4 ++--
 .../webtools/bugzilla/template/en/default/filterexceptions.pl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index a59bd186e0d..1f0f0068dc0 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8424
\ No newline at end of file
+8425
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl
index b8de6c735d5..b9ad2a5355f 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl
@@ -129,11 +129,11 @@
     <tr>
       <th>Sort Key:</th>
       <td>
-        a number between 1 and [% constants.MAX_SMALLINT FILTER none %] by which
+        a number between 0 and [% constants.MAX_SMALLINT FILTER none %] by which
         this type will be sorted when displayed to users in a list; ignore if you
         don't care what order the types appear in or if you want them to appear
         in alphabetical order.<br>
-        <input type="text" name="sortkey" value="[% type.sortkey || 1 %]" size="5" maxlength="5"
+        <input type="text" name="sortkey" value="[% type.sortkey || 0 %]" size="5" maxlength="5"
                [%- ' disabled="disabled"' UNLESS can_fully_edit %]>
       </td>
     </tr>
diff --git a/mozilla/webtools/bugzilla/template/en/default/filterexceptions.pl b/mozilla/webtools/bugzilla/template/en/default/filterexceptions.pl
index 7544b6808db..62084e72712 100644
--- a/mozilla/webtools/bugzilla/template/en/default/filterexceptions.pl
+++ b/mozilla/webtools/bugzilla/template/en/default/filterexceptions.pl
@@ -389,7 +389,7 @@
 
 'admin/flag-type/edit.html.tmpl' => [
   'type.id', 
-  'type.sortkey || 1',
+  'type.sortkey || 0',
   'selname',
 ],