Bug 791554: Make clear that 0 is a valid sortkey for flagtypes

r/a=LpSolit

diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index b8de6c735d5b28411d37d98f187a6413dd3c9bdb..b9ad2a5355feb6665d23e73f16afe79e62229b16 100644 (file)
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/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/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 7544b6808dbd9122292b833c3e4208be7d417549..62084e7271250432018f05f34389014336a65886 100644 (file)
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -389,7 +389,7 @@
 
 'admin/flag-type/edit.html.tmpl' => [
   'type.id', 
-  'type.sortkey || 1',
+  'type.sortkey || 0',
   'selname',
 ],