From: mkanat%bugzilla.org <>
Date: Sun, 13 Dec 2009 20:49:07 +0000 (+0000)
Subject: Bug 527387: Make Parameter section sortkeys numeric and leave space between the numbers
X-Git-Tag: bugzilla-3.5.3~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63b76161d5c839fe1922eeb4e762b7dece1daa4a;p=thirdparty%2Fbugzilla.git

Bug 527387: Make Parameter section sortkeys numeric and leave space between the numbers
Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
---

diff --git a/Bugzilla/Config/Admin.pm b/Bugzilla/Config/Admin.pm
index d4e822816a..e6141cf9e0 100644
--- a/Bugzilla/Config/Admin.pm
+++ b/Bugzilla/Config/Admin.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Admin::sortkey = "01";
+our $sortkey = 200;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/Attachment.pm b/Bugzilla/Config/Attachment.pm
index 3468f084c2..ed4c4e4596 100644
--- a/Bugzilla/Config/Attachment.pm
+++ b/Bugzilla/Config/Attachment.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Attachment::sortkey = "025";
+our $sortkey = 400;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/Auth.pm b/Bugzilla/Config/Auth.pm
index 1af808eaaa..c7d921ed57 100644
--- a/Bugzilla/Config/Auth.pm
+++ b/Bugzilla/Config/Auth.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Auth::sortkey = "02";
+our $sortkey = 300;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/BugChange.pm b/Bugzilla/Config/BugChange.pm
index 0e518b6899..4e197c5e93 100644
--- a/Bugzilla/Config/BugChange.pm
+++ b/Bugzilla/Config/BugChange.pm
@@ -36,7 +36,7 @@ use strict;
 use Bugzilla::Config::Common;
 use Bugzilla::Status;
 
-$Bugzilla::Config::BugChange::sortkey = "03";
+our $sortkey = 500;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/BugFields.pm b/Bugzilla/Config/BugFields.pm
index c7f7f6e5ac..9f3ddc9abb 100644
--- a/Bugzilla/Config/BugFields.pm
+++ b/Bugzilla/Config/BugFields.pm
@@ -36,7 +36,7 @@ use strict;
 use Bugzilla::Config::Common;
 use Bugzilla::Field;
 
-$Bugzilla::Config::BugFields::sortkey = "04";
+our $sortkey = 600;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/BugMove.pm b/Bugzilla/Config/BugMove.pm
index 87f6cbd732..2d973d8cab 100644
--- a/Bugzilla/Config/BugMove.pm
+++ b/Bugzilla/Config/BugMove.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::BugMove::sortkey = "05";
+our $sortkey = 700;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/Core.pm b/Bugzilla/Config/Core.pm
index 1bfebfa69a..550875e35a 100644
--- a/Bugzilla/Config/Core.pm
+++ b/Bugzilla/Config/Core.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Core::sortkey = "00";
+our $sortkey = 100;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/DependencyGraph.pm b/Bugzilla/Config/DependencyGraph.pm
index db784c1356..b217bfb065 100644
--- a/Bugzilla/Config/DependencyGraph.pm
+++ b/Bugzilla/Config/DependencyGraph.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::DependencyGraph::sortkey = "06";
+our $sortkey = 800;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/GroupSecurity.pm b/Bugzilla/Config/GroupSecurity.pm
index f0038f153f..f7f717379d 100644
--- a/Bugzilla/Config/GroupSecurity.pm
+++ b/Bugzilla/Config/GroupSecurity.pm
@@ -36,7 +36,7 @@ use strict;
 use Bugzilla::Config::Common;
 use Bugzilla::Group;
 
-$Bugzilla::Config::GroupSecurity::sortkey = "07";
+our $sortkey = 900;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/LDAP.pm b/Bugzilla/Config/LDAP.pm
index a9b46382e3..e47f923083 100644
--- a/Bugzilla/Config/LDAP.pm
+++ b/Bugzilla/Config/LDAP.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::LDAP::sortkey = "09";
+our $sortkey = 1000;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index c7843e286d..b1e3ab1a48 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -36,7 +36,7 @@ use strict;
 use Bugzilla::Config::Common;
 use Email::Send;
 
-$Bugzilla::Config::MTA::sortkey = "10";
+our $sortkey = 1200;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/PatchViewer.pm b/Bugzilla/Config/PatchViewer.pm
index 8de04ef76e..6bd9557a99 100644
--- a/Bugzilla/Config/PatchViewer.pm
+++ b/Bugzilla/Config/PatchViewer.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::PatchViewer::sortkey = "11";
+our $sortkey = 1300;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/Query.pm b/Bugzilla/Config/Query.pm
index 6479db8cea..808a9a102c 100644
--- a/Bugzilla/Config/Query.pm
+++ b/Bugzilla/Config/Query.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::Query::sortkey = "12";
+our $sortkey = 1400;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/RADIUS.pm b/Bugzilla/Config/RADIUS.pm
old mode 100755
new mode 100644
index 6701d6f089..bc072a9c4d
--- a/Bugzilla/Config/RADIUS.pm
+++ b/Bugzilla/Config/RADIUS.pm
@@ -25,7 +25,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::RADIUS::sortkey = "09";
+our $sortkey = 1100;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/ShadowDB.pm b/Bugzilla/Config/ShadowDB.pm
index f9af4fb6dd..a605b23635 100644
--- a/Bugzilla/Config/ShadowDB.pm
+++ b/Bugzilla/Config/ShadowDB.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::ShadowDB::sortkey = "13";
+our $sortkey = 1500;
 
 sub get_param_list {
   my $class = shift;
diff --git a/Bugzilla/Config/UserMatch.pm b/Bugzilla/Config/UserMatch.pm
index 9e19f1d2bc..f97cfeab2a 100644
--- a/Bugzilla/Config/UserMatch.pm
+++ b/Bugzilla/Config/UserMatch.pm
@@ -35,7 +35,7 @@ use strict;
 
 use Bugzilla::Config::Common;
 
-$Bugzilla::Config::UserMatch::sortkey = "14";
+our $sortkey = 1600;
 
 sub get_param_list {
   my $class = shift;
diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
index a35ec0f4ae..666d88dffe 100644
--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -27,7 +27,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% curpanel = -1 %]
-[% panels = panels.sort('sortkey') %]
+[% panels = panels.nsort('sortkey') %]
 
 [% FOREACH panel = panels %]
   [% PROCESS "admin/params/${panel.name}.html.tmpl"