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

diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
index 8bcbf2504..d24c9abe4 100644
--- a/httemplate/elements/select-table.html
+++ b/httemplate/elements/select-table.html
@@ -28,12 +28,16 @@ Example:
     'disable_empty'  => 0, # bool (implied by multiple)
     'debug'          => 0, #set true to enable
     'label_callback' => sub { my $record = shift; return "label"; },
+    '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)
   )
 
 </%doc>
+% unless ( $opt{'js_only'} ) {
 
 <SELECT <% $opt{'multiple'} ? 'MULTIPLE' : '' %>
         NAME = "<% $opt{'element_name'} || $opt{'field'} || $key %>"
+        ID   = "<% $opt{'id'} || $key %>"
         <% $onchange %>
         <% $opt{'element_etc'} %>
 >
@@ -61,6 +65,7 @@ Example:
 
 </SELECT>
 
+%}
 <%init>
 
 my( %opt ) = @_;
@@ -68,25 +73,45 @@ my( %opt ) = @_;
 warn "elements/select-table.html: \n". Dumper(%opt)
   if exists $opt{debug} && $opt{debug};
 
-my $onchange = $opt{'onchange'}
-                 ? 'onChange="'. $opt{'onchange'}. '(this)"'
-                 : '';
+my $onchange = '';
+if ( $opt{'onchange'} ) {
+  $onchange = $opt{'onchange'};
+  $onchange .= '(this)' unless $onchange =~ /\(\w*\);?$/;
+  $onchange =~ s/\(what\);/\(this\);/g; #ugh, terrible hack.  all onchange
+                                        #callbacks should act the same
+  $onchange = 'onChange="'. $onchange. '"';
+}
+
+my $dbdef_table = dbdef->table($opt{'table'})
+  or die "can't find dbdef for ". $opt{'table'}. " table\n";
 
-my $key = dbdef->table($opt{'table'})->primary_key; #? $opt{'primary_key'} ||
+my $key = $dbdef_table->primary_key; #? $opt{'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 $extra_sql = $opt{'extra_sql'} || '';
+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'}
+                                   );
+}
+
 my @records = ();
 if ( $opt{'records'} ) {
   @records = @{ $opt{'records'} };
 } else {
   @records = qsearch( {
     'table'     => $opt{'table'},
-    'hashref'   => ( $opt{'hashref'} || {} ),
-    'extra_sql' => ( $opt{'extra_sql'} || '' ),
+    'hashref'   => $hashref,
+    'extra_sql' => $extra_sql,
+    'order_by'  => ( $opt{'order_by'} || "ORDER BY $name_col" ),
   });
 }
 
@@ -99,7 +124,7 @@ unless (    ! $value
   $opt{hashref}->{$key} = $value;
   my $record = qsearchs( {
     'table'     => $opt{table},
-    'hashref'   => $opt{hashref},
+    'hashref'   => $hashref,
     'extra_sql' => ( $opt{extra_sql} || '' ),
   });
   push @records, $record if $record;