[freeside-commits] freeside/httemplate/edit agent_type.cgi, 1.11, 1.12

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail:/tmp/cvs-serv2460

Modified Files:
	agent_type.cgi 
Log Message:
list disabled packages on agent type edit if they are still associated with the type

Index: agent_type.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/agent_type.cgi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- agent_type.cgi	18 Nov 2005 14:59:53 -0000	1.11
+++ agent_type.cgi	1 Dec 2005 19:17:05 -0000	1.12
@@ -37,7 +37,15 @@
 
 Select which packages agents of this type may sell to customers<BR>
 
-<% foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) { %>
+<% foreach my $part_pkg (
+     qsearch({ 'table'     => 'part_pkg',
+               'hashref'   => { 'disabled' => '' },
+               'select'    => 'part_pkg.*',
+               'addl_from' => 'LEFT JOIN type_pkgs USING ( pkgpart )',
+               'extra_sql' => 'OR typenum = '. $agent_type->typenum,
+            })
+   ) {
+%>
 
   <BR>
   <INPUT TYPE="checkbox" NAME="pkgpart<%= $part_pkg->pkgpart %>" <%=
@@ -50,7 +58,8 @@
   %> VALUE="ON">
 
   <A HREF="<%= $p %>edit/part_pkg.cgi?<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkgpart %>: 
-  <%= $part_pkg->pkg %> (<%= $part_pkg->comment %>)</A>
+  <%= $part_pkg->pkg %> - <%= $part_pkg->comment %></A>
+  <%= $part_pkg->disabled =~ /^Y/i ? ' (DISABLED)' : '' %>
 
 <% } %>