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 d4e822816af78ec30b639481c00e1c15a092d367..e6141cf9e0b31ca1f82234edb89861c9f5210fe0 100644 (file)
--- 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 3468f084c20f16fda0dfff3060f9a5c0d878c3b9..ed4c4e45962a528bdc7ae77b4abfaaffbd72ec3c 100644 (file)
--- 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 1af808eaaa8fa558ca65ca1e8acebad3e6fc754b..c7d921ed57ba10b2294897484087520563bbe322 100644 (file)
--- 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 0e518b68993222694bc8a277c87513ea7399ae41..4e197c5e93226fad16eed455d7f4823f066ddd72 100644 (file)
--- 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 c7f7f6e5acecef62ac8f70a7cc49bfa4ae111a2c..9f3ddc9abb1266cfb29f9eb0983006b0358d6a7b 100644 (file)
--- 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 87f6cbd7325e80ce97545e14ce4521e2745d530c..2d973d8cab141bbbe125b81026ba63cbe0d21f0e 100644 (file)
--- 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 1bfebfa69a905c8213a79293207605d56a2db11d..550875e35aea4f7a29735608df56025f10216092 100644 (file)
--- 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 db784c135648bb2d5d91efcebaf857e5a4318f07..b217bfb0656331f7d26728d4099b703c1747ee6e 100644 (file)
--- 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 f0038f153fcfaebd1aa06b3d2b0fc05b70e1b0a3..f7f717379d591977f9655f1845dc408040fd65ff 100644 (file)
--- 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 a9b46382e3f3da281612f9e24fb5d6599d024699..e47f923083f4e0b7ffcecf7803465006572f2c66 100644 (file)
--- 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 c7843e286dfddcb8e4a701d32a20e6e5f5f50362..b1e3ab1a48af978bace580a457aa35d60547dc70 100644 (file)
--- 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 8de04ef76e07a6aa6c36288b147adfe59317c836..6bd9557a9952c9f95887c3a84e7d88c6e90eb41b 100644 (file)
--- 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 6479db8ceac4de0053181d37c67fdbe643072923..808a9a102c00564e4ec7414e73a125c1b755b1e7 100644 (file)
--- 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 (executable)
new mode 100644 (file)
index 6701d6f..bc072a9
--- 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 f9af4fb6dd858f15988282ba78b0ff196887bad2..a605b236351508366af7c3c312a552e96772bbb0 100644 (file)
--- 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 9e19f1d2bc4100752ef16f450922994bb0ee90e4..f97cfeab2afaa7ba58d5246512141927ffbb2f5f 100644 (file)
--- 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 a35ec0f4ae7ae10c90eff2f4d8a60385cabe1cdb..666d88dffe7c5c5aeb2cda36246d1629b831922c 100644 (file)
--- 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"