X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-table.html;h=1632b596adc1f7e77622666889d37802454c4cec;hb=8ad827f9de1dd45c354381a58a2609f0d59fd8e7;hp=d24c9abe4602b64bd576ce95002906733d997710;hpb=a1871d3d13c1dafa93b956762c0d23728d261da7;p=freeside.git

diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
index d24c9abe4..1632b596a 100644
--- a/httemplate/elements/select-table.html
+++ b/httemplate/elements/select-table.html
@@ -4,7 +4,9 @@ Example:
 
   include( '/elements/select-table.html',
 
-    #required
+    ##
+    # required
+    ##
     'table'          => 'table_name',
     'name_col'       => 'name_column',
    
@@ -12,24 +14,47 @@ Example:
     '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'       => 0, #set true to always show un-agented entries
+    'agent_null_right' => '', #right to see un-agented entries
+    #or
+    'records'        => \@records, #instead of search params
+
+    #instead of the primary key... only for special cases
+    'value_col'      => 'columnname',
+
+    #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_showkey'  => 0, # bool
+    '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>
@@ -43,21 +68,32 @@ Example:
 >
 
 % while ( @pre_options ) { 
-    <OPTION VALUE="<% shift(@pre_options) %>"><% shift(@pre_options) %>
-
+%   my $pre_opt   = shift(@pre_options);
+%   my $pre_label = shift(@pre_options);
+%   my $selected =    ( ref($value) && $value->{$pre_opt} )
+%                  || ( $value eq $pre_opt );
+    <OPTION VALUE="<% $pre_opt %>"
+            <% $selected ? 'SELECTED' : '' %>
+    ><% $pre_label %>
 % } 
 
 % unless ( $opt{'multiple'} || $opt{'disable_empty'} ) {
     <OPTION VALUE=""><% $opt{'empty_label'} || 'all' %>
 % }
 
-% foreach my $record ( sort { $a->$name_col() cmp $b->$name_col() } @records ) {
+% foreach my $record ( sort {    $a->$name_col() cmp $b->$name_col()
+%                             || $a->$key()      <=> $b->$key()
+%                           }
+%                           @records
+%                    )
+% {
 %   my $recvalue = $record->$key();
     <OPTION VALUE="<% $recvalue %>"
             <% ref($value) && $value->{$recvalue} || $value == $recvalue
                ? ' SELECTED' : ''
             %>
-    ><% $opt{'label_callback'}
+    ><% $opt{'label_showkey'} ? "$recvalue: " : '' %>
+     <% $opt{'label_callback'}
           ? &{ $opt{'label_callback'} }( $record )
           : $record->$name_col()
      %>
@@ -85,21 +121,23 @@ if ( $opt{'onchange'} ) {
 my $dbdef_table = dbdef->table($opt{'table'})
   or die "can't find dbdef for ". $opt{'table'}. " table\n";
 
-my $key = $dbdef_table->primary_key; #? $opt{'primary_key'} ||
+my $key = $opt{'value_col'} || $dbdef_table->primary_key;
 
 my $name_col = $opt{'name_col'};
 
 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 .=
     ( $extra_sql =~ /WHERE/i || scalar(keys %$hashref ) ? ' AND ' : ' WHERE ' ).
     $FS::CurrentUser::CurrentUser->agentnums_sql(
-                                    'null_right' => $opt{'agent_null_right'}
+                                    'null'       => $opt{'agent_null'},
+                                    'null_right' => $opt{'agent_null_right'},
                                    );
 }
 
@@ -109,13 +147,14 @@ if ( $opt{'records'} ) {
 } 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" ),
   });
 }
 
-unless (    ! $value
+unless (    $value < 1 # !$value #ignore negatives too
          or ref($value)
          or ! exists( $opt{hashref}->{disabled} ) #??
          or grep { $value == $_->$key() } @records
@@ -124,8 +163,9 @@ unless (    ! $value
   $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;
 }