optimize CDR rating after timed rate perf regression, RT#15739

[freeside.git] / httemplate / browse / agent_type.cgi

diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index a5ffb10..1959302 100755 (executable)
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,49 +1,11 @@
-<%
-
-my $html_init = 
-  'Agent types define groups of packages that you can then assign to'.
-  ' particular agents.<BR><BR>'.
-  qq!<A HREF="${p}edit/agent_type.cgi"><I>Add a new agent type</I></A><BR><BR>!;
-
-my $count_query = 'SELECT COUNT(*) FROM agent_type';
-
-#false laziness w/access_user.html
-my $packages_sub = sub {
-  my $agent_type = shift;
-
-  [ map  {
-           my $type_pkgs = $_;
-           my $part_pkg = $type_pkgs->part_pkg;
-           [
-             {
-               'data'  => $part_pkg->pkg. ' - '. $part_pkg->comment,
-               'align' => 'left',
-               'link'  => $p. 'edit/part_pkg.cgi?'. $type_pkgs->pkgpart,
-             },
-           ];
-         }
-    #sort {
-    #     }
-    grep {
-           $_->part_pkg and ! $_->part_pkg->disabled
-         }
-    $agent_type->type_pkgs #XXX the method should order itself by something
-  ];
-
-};
-
-my $link = [ $p.'edit/agent_type.cgi?', 'typenum' ];
-
-%><%= include( 'elements/browse.html',
+<% include( 'elements/browse.html',
                  'title'   => 'Agent Types',
-                 'menubar'     => [ #'Main menu' => $p,
-                                    'Agents'    =>"${p}browse/agent.cgi",
-                                  ],
+                 'menubar'     => [ 'Agents'    =>"${p}browse/agent.cgi", ],
                  'html_init'   => $html_init,
                  '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'      => [ '#',
@@ -60,3 +22,42 @@ my $link = [ $p.'edit/agent_type.cgi?', 'typenum' ];
                                   ],
              )
 %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $html_init = 
+'Agent types define groups of packages that you can then assign to'.
+' particular agents.<BR><BR>'.
+qq!<A HREF="${p}edit/agent_type.cgi"><I>Add a new agent type</I></A><BR><BR>!;
+
+my $count_query = 'SELECT COUNT(*) FROM agent_type';
+
+#false laziness w/access_user.html
+my $packages_sub = sub {
+my $agent_type = shift;
+
+[ map  {
+         my $type_pkgs = $_;
+         #my $part_pkg = $type_pkgs->part_pkg;
+         [
+           {
+             #'data'  => $part_pkg->pkg. ' - '. $part_pkg->comment,
+             'data'  => $type_pkgs->pkg. ' - '.
+                        ( $type_pkgs->custom ? '(CUSTOM) ' : '' ).
+                        $type_pkgs->comment,
+             'align' => 'left',
+             'link'  => $p. 'edit/part_pkg.cgi?'. $type_pkgs->pkgpart,
+           },
+         ];
+       }
+
+  $agent_type->type_pkgs_enabled
+];
+
+};
+
+my $link = [ $p.'edit/agent_type.cgi?', 'typenum' ];
+
+</%init>