[freeside-commits] freeside/httemplate/elements select-table.html, 1.12, 1.13 select-domain.html, NONE, 1.1 tr-select-domain.html, NONE, 1.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv24340/elements

Modified Files:
	select-table.html 
Added Files:
	select-domain.html tr-select-domain.html 
Log Message:
add domain selection to advanced account report (side effect on RT#4623)

--- NEW FILE: select-domain.html ---
<% include( '/elements/select-table.html',
    'table'            => 'svc_domain',
    'name_col'         => 'domain',
    'empty_label'      => 'all',
    'addl_from'        => ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
                         #' LEFT JOIN part_svc  USING ( svcpart ) '.
                          ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
                          ' LEFT JOIN cust_main USING ( custnum ) ',
    'agent_virt'       => 1,
    'agent_null-right' => 'View/link unlinked services',
    @_,
   )
%>

--- NEW FILE: tr-select-domain.html ---
% #if ( scalar(@domains) < 2 ) {
% #} else {
  <TR>
    <TD ALIGN="right"><% $opt{'label'} || 'Domain' %></TD>
    <TD>
      <% include( '/elements/select-domain.html', %opt) %>
    </TD>
   </TR>
% #}
<%init>
  my %opt = @_;
</%init>

Index: select-table.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-table.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- select-table.html	28 Jun 2008 19:25:22 -0000	1.12
+++ select-table.html	24 Jan 2009 21:04:17 -0000	1.13
@@ -4,7 +4,9 @@
 
   include( '/elements/select-table.html',
 
-    #required
+    ##
+    # required
+    ##
     'table'          => 'table_name',
     'name_col'       => 'name_column',
    
@@ -12,24 +14,42 @@
     'curr_value'     => 'current_value',
     #'value' => #deprecated form of 'curr_value',
    
-    #opt
-    'empty_label'    => '', #better specify it though, the default might change
-    'hashref'        => {},
-    'extra_sql'      => '',
-    'records'        => \@records, #instead of hashref
+    ##
+    # optional
+    ##
+
+    #search params
+    'hashref'          => {},
+    'addl_from'        => '',
+    'extra_sql'        => '',
+    'agent_virt'       => 0, #set true and make sure the result is JOINed to
+                             #something with agentnum (usually cust_main)
+    'agent_null_right' => '', #right to see un-agented entries
+    #or
+    'records'        => \@records, #instead of search params
+
+    #basic params controlling the resulting <SELECT>
     'pre_options'    => [ 'value' => 'option' ], #before normal options
+    'empty_label'    => '', #better specify it though, the default might change
+    'multiple'       => 0, # bool
+    'disable_empty'  => 0, # bool (implied by multiple)
+    'label_callback' => sub { my $record = shift; return "label"; },
+
+    #more params controlling HTML stuff about the <SELECT>
     'element_name'   => '', #HTML element name, defaults to the name of
                             # the primary key column
     'field'          => '', #synonym for element_name
     'element_etc'    => '', #additional attributes (i.e. "DISABLED") for the
                             #<SELECT> element
     'onchange'       => '', #javascript code
-    'multiple'       => 0, # bool
-    'disable_empty'  => 0, # bool (implied by multiple)
-    'debug'          => 0, #set true to enable
-    'label_callback' => sub { my $record = shift; return "label"; },
+
+    #special return options
     'js_only'      => 0, #set true to return only the JS portions (i.e. nothing)
     'html_only'    => 0, #set true to return only the HTML portions (no-op, i.e. return everything)
+
+    #debugging
+    'debug'          => 0, #set true to enable
+
   )
 
 </%doc>
@@ -92,8 +112,9 @@
 my $value = $opt{'curr_value'} || $opt{'value'};
 $value = [ split(/\s*,\s*/, $value) ] if $opt{'multiple'} && $value =~ /,/;
 
+#my $addl_from = $opt{'addl_from'} || '';
 my $extra_sql = $opt{'extra_sql'} || '';
-my $hashref =   $opt{'hashref'} || {};
+my $hashref   = $opt{'hashref'} || {};
 
 if ( $opt{'agent_virt'} ) {
   $extra_sql .=
@@ -109,6 +130,7 @@
 } else {
   @records = qsearch( {
     'table'     => $opt{'table'},
+    'addl_from' => $opt{'addl_from'},
     'hashref'   => $hashref,
     'extra_sql' => $extra_sql,
     'order_by'  => ( $opt{'order_by'} || "ORDER BY $name_col" ),
@@ -124,8 +146,9 @@
   $opt{hashref}->{$key} = $value;
   my $record = qsearchs( {
     'table'     => $opt{table},
+    'addl_from' => $opt{'addl_from'},
     'hashref'   => $hashref,
-    'extra_sql' => ( $opt{extra_sql} || '' ),
+    'extra_sql' => $extra_sql,
   });
   push @records, $record if $record;
 }