sort by clicking on headers, RT#6465

13 files changed, 16 insertions, 17 deletions

diff --git a/httemplate/browse/access_group.html b/httemplate/browse/access_group.html
index aa9097f36..2df0ba053 100644
--- a/httemplate/browse/access_group.html
+++ b/httemplate/browse/access_group.html
@@ -5,7 +5,7 @@
                  'name'        => 'employee groups',
                  'query'       => { 'table'     => 'access_group',
                                     'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY groupname', #??
+                                    'order_by' => 'ORDER BY groupname', #??
                                   },
                  'count_query' => $count_query,
                  'header'      => [ '#',
diff --git a/httemplate/browse/access_user.html b/httemplate/browse/access_user.html
index 3162e3a6c..6a1fea1ce 100644
--- a/httemplate/browse/access_user.html
+++ b/httemplate/browse/access_user.html
@@ -7,7 +7,7 @@
                  'disabled_statuspos' => 2,
                  'query'              => { 'table'     => 'access_user',
                                            'hashref'   => {},
-                                           'extra_sql' => 'ORDER BY last, first'
+                                           'order_by' => 'ORDER BY last, first'
                                          },
                  'count_query'        => $count_query,
                  'header'             => \@header,
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index f07a6515b..1959302d2 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -5,7 +5,7 @@
                  'name'        => 'agent types',
                  'query'       => { 'table'     => 'agent_type',
                                     'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY typenum', # 'ORDER BY atype',
+                                    'order_by' => 'ORDER BY typenum', # 'ORDER BY atype',
                                   },
                  'count_query' => $count_query,
                  'header'      => [ '#',
diff --git a/httemplate/browse/cust_attachment.html b/httemplate/browse/cust_attachment.html
index e19259d05..9d62e5609 100755
--- a/httemplate/browse/cust_attachment.html
+++ b/httemplate/browse/cust_attachment.html
@@ -13,7 +13,7 @@
                     , 
                  'query'       => { 'table'     => 'cust_attachment',
                                     'hashref'   => $hashref,
-                                    'extra_sql' => 'ORDER BY '.$orderby,
+                                    'order_by' => 'ORDER BY '.$orderby,
                                   },
                  'count_query' => $count_query,
                  'header' => [ selflink('#',orderby => 'attachnum'),
diff --git a/httemplate/browse/cust_category.html b/httemplate/browse/cust_category.html
index 4468d2f09..09168bac4 100644
--- a/httemplate/browse/cust_category.html
+++ b/httemplate/browse/cust_category.html
@@ -6,7 +6,7 @@
                  'disabled_statuspos' => 2,
                  'query'       => { 'table'     => 'cust_category',
                                     'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY categorynum',
+                                    'order_by' => 'ORDER BY categorynum',
                                   },
                  'count_query' => $count_query,
                  'header'      => [ '#', 'Category' ],
diff --git a/httemplate/browse/cust_class.html b/httemplate/browse/cust_class.html
index da303cf72..d7c622837 100644
--- a/httemplate/browse/cust_class.html
+++ b/httemplate/browse/cust_class.html
@@ -6,7 +6,7 @@
                  'disabled_statuspos' => 2,
                  'query'       => { 'table'     => 'cust_class',
                                     'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY classnum',
+                                    'order_by' => 'ORDER BY classnum',
                                   },
                  'count_query' => $count_query,
                  'header'      => $header,
diff --git a/httemplate/browse/discount.html b/httemplate/browse/discount.html
index f7ef0b30f..13dc1e6f9 100644
--- a/httemplate/browse/discount.html
+++ b/httemplate/browse/discount.html
@@ -7,14 +7,13 @@
                  'query'       => { 'table' => 'discount', },
                  'count_query' => 'SELECT COUNT(*) FROM discount',
                  'disableable' => 1,
-                 'disabled_statuspos' => 2,
-                 'header'      => [ '#', 'Name', 'Discount', ],
-                 'fields'      => [ 'discountnum',
-                                    'name',
+                 'disabled_statuspos' => 1,
+                 'header'      => [ 'Name', 'Discount', ],
+                 'fields'      => [ 'name',
                                     'description',
                                   ],
                  'links'       => [ $link,
-                                    $link,
+                                    '',
                                   ],
              )
 %>
diff --git a/httemplate/browse/part_pkg_report_option.html b/httemplate/browse/part_pkg_report_option.html
index 9745b13d2..00f2e8388 100644
--- a/httemplate/browse/part_pkg_report_option.html
+++ b/httemplate/browse/part_pkg_report_option.html
@@ -6,7 +6,7 @@
                  'disabled_statuspos' => 2,
                  'query'       => { 'table'     => 'part_pkg_report_option',
                                     'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY name',
+                                    'order_by' => 'ORDER BY name',
                                   },
                  'count_query' => 'SELECT COUNT(*) FROM part_pkg_report_option',
                  'header'      => [ '#', 'Class' ],
diff --git a/httemplate/browse/pkg_category.html b/httemplate/browse/pkg_category.html
index 16da23066..2c181a3db 100644
--- a/httemplate/browse/pkg_category.html
+++ b/httemplate/browse/pkg_category.html
@@ -6,7 +6,7 @@
                  'disabled_statuspos' => 3,
                  'query'       => { 'table'     => 'pkg_category',
                                     'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY categorynum',
+                                    'order_by' => 'ORDER BY categorynum',
                                   },
                  'count_query' => $count_query,
                  'header'      => [ '#', 'Category', 'Weight', 'Condense' ],
diff --git a/httemplate/browse/pkg_class.html b/httemplate/browse/pkg_class.html
index 7097c8617..97b0621ae 100644
--- a/httemplate/browse/pkg_class.html
+++ b/httemplate/browse/pkg_class.html
@@ -6,7 +6,7 @@
                  'disabled_statuspos' => 2,
                  'query'       => { 'table'     => 'pkg_class',
                                     'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY classnum',
+                                    'order_by' => 'ORDER BY classnum',
                                   },
                  'count_query' => $count_query,
                  'header'      => $header,
diff --git a/httemplate/browse/rate.cgi b/httemplate/browse/rate.cgi
index 428158a6d..c6cfec074 100644
--- a/httemplate/browse/rate.cgi
+++ b/httemplate/browse/rate.cgi
@@ -9,7 +9,7 @@
               'name'        => 'rate plans',
               'query'       => { 'table'     => 'rate',
                                  'hashref'   => {},
-                                 'extra_sql' => 'ORDER BY ratenum',
+                                 'order_by' => 'ORDER BY ratenum',
                                },
               'count_query' => $count_query,
               'header'      => [ '#',       'Rate plan', 'Rates'    ],
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 501d3625a..e71a8a732 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -46,7 +46,7 @@ my $query = { 'select'    => '*,
                              ',
               'table'     => 'svc_acct_pop',
               #'hashref'   => { 'disabled' => '' },
-              'extra_sql' => 'ORDER BY state, city, ac, exch, loc',
+              'order_by' => 'ORDER BY state, city, ac, exch, loc',
             };
 
 my $count_query = "SELECT COUNT(*) FROM svc_acct_pop"; # WHERE DISABLED IS NULL OR DISABLED = ''";
diff --git a/httemplate/browse/usage_class.html b/httemplate/browse/usage_class.html
index 75223e025..7e55dba2a 100644
--- a/httemplate/browse/usage_class.html
+++ b/httemplate/browse/usage_class.html
@@ -6,7 +6,7 @@
                  'disabled_statuspos' => 2,
                  'query'       => { 'table'     => 'usage_class',
                                     'hashref'   => {},
-                                    'extra_sql' => 'ORDER BY classnum',
+                                    'order_by' => 'ORDER BY classnum',
                                   },
                  'count_query' => 'SELECT COUNT(*) FROM usage_class',
                  'header'      => [ '#',