X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fedit.html;h=4e896f2395af01a1c9f09c39704d01710fb91117;hp=4da82b4762b53c998404ac98383bfb7b078edfab;hb=bda8c33f9b346ba6cd7aa4174ce0d3e37db7bd49;hpb=624b2d44625f69d71175c3348cae635d580c890b

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 4da82b476..4e896f239 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -2,7 +2,7 @@
 
 Example:
 
-  include( 'elements/edit.html',  
+  <& elements/edit.html,  
     'name_singular' =>  #singular name for the record
                         # (preferred, will be pluralized automatically)
     'name'          =>  #name for the record
@@ -96,6 +96,7 @@ Example:
 
     #agent virtualization
     'agent_virt'            => 1,
+    'agent_null'            => 1, #if true, always allow no-agentnum globals
     'agent_null_right'      => 'Access Right Name',
     'agent_clone_extra_sql' => '', #if provided, this overrides the extra_sql
                                    #implementing agent virt, for clone
@@ -181,7 +182,7 @@ Example:
     #run before display to manipulate element of the 'fields' arrayref
     'field_callback' => sub { my( $cgi, $object, $field_hashref ) = @_; },
 
-  );
+  &>
 
 </%doc>
 
@@ -259,6 +260,10 @@ Example:
 %     'maxlength'     => $f->{'maxlength'},
 %     'postfix'       => $f->{'postfix'},
 %
+%     #textarea
+%     'rows'          => $f->{'rows'},
+%     'cols'          => $f->{'cols'},
+%
 %     #checkbox, title, fixed, hidden
 %     #& deprecated weird value hashref used only by reason.html
 %     'value'         => $f->{'value'},
@@ -267,6 +272,7 @@ Example:
 %     'options'       => $f->{'options'},
 %     'labels'        => $f->{'labels'},
 %     'multiple'      => $f->{'multiple'},
+%     'label_showkey' => $f->{'label_showkey'},
 %     'disable_empty' => $f->{'disable_empty'},
 %     #select-reason
 %     'reason_class'  => $f->{'reason_class'},
@@ -278,32 +284,30 @@ Example:
 %
 %     #umm.  for select-agent_types at least
 %     'disabled'      => $f->{'disabled'},
-%   );
 %
-%   #selectlayers, others?
-%   $include_common{$_} = $f->{$_}
-%     foreach grep exists($f->{$_}),
-%                  qw( js_only html_only select_only layers_only cell_style);
+%     #any?
+%     'colspan'       => $f->{'colspan'},
+%     'required'      => $f->{'required'},
+%   );
 %
-%   #select-*
-%   $include_common{$_} = $f->{$_}
-%     foreach grep exists($f->{$_}), qw( empty_label );
+%   $include_common{$_} = $f->{$_} foreach grep exists($f->{$_}),
+%     qw( js_only html_only select_only layers_only cell_style ),#selectlayers,?
+%     qw( empty_label ),                                   # select-*
+%     qw( value_col ),                                     # select-table
+%     qw( table name_col ),                           #(select,checkboxes)-table
+%     qw( target_table link_table ),                       #checkboxes-table
+%     qw( hashref agent_virt agent_null agent_null_right ),#*-table
+%     qw( formatted_value ),                               #fixed
+%     qw( country ),                                       #select-country
+%     qw( width height ),                                  #htmlarea
+%     qw( alt_format ),                                    #select-cust_location
+%   ;
 %
 %   #select-table
-%   $include_common{$_} = $f->{$_}
-%     foreach grep exists($f->{$_}), qw( value_col extra_sql );
-%
-%   #select-table, checkboxes-table
-%   $include_common{$_} = $f->{$_}
-%     foreach grep exists($f->{$_}), qw( table name_col  );
-%
-%   #checkboxes-table
-%   $include_common{$_} = $f->{$_}
-%     foreach grep exists($f->{$_}), qw( target_table link_table );
-%
-%   #*-table
-%   $include_common{$_} = $f->{$_}
-%     foreach grep exists($f->{$_}), qw( hashref agent_virt agent_null_right );
+%   $include_common{$_} = ref( $f->{$_} ) eq 'CODE'
+%                           ? &{ $f->{$_} }( $cgi, $object ) #, $f )
+%                           : $f->{$_}
+%     foreach grep exists($f->{$_}), qw( extra_sql );
 %
 %   if ( $type eq 'tablebreak-tr-title' ) {
 %     $include_common{'table_id'} = 'TableNumber'. $tablenum++;
@@ -340,6 +344,19 @@ Example:
 %         %include_common,
 %         %opt,
 %     );
+%
+%     if ( $include eq 'tr-input-date-field' ) {
+%	# it's either hacking it here, or changing a lot more stuff
+%	@include = (
+%		"/elements/$include.html", {
+%			'name' => $field,
+%			'value' => $opt{curr_value},
+%			'label' => $label,
+%			'noinit' => $f->{noinit},
+%		}
+%	);
+%     }
+%
 %     @include;
 %   };
 %
@@ -368,6 +385,7 @@ Example:
 %     $g_row = 1 if $type eq 'tablebreak-tr-title';
 %     $g_row++;
 %     $g_row++ if $type eq 'title';
+%     $g_row += scalar( @{ $f->{options} } )-1 if $type eq 'radio';
 %   } else {
 %     if ( $type eq 'columnstart' ) {
 %       push @g_row_stack, $g_row;
@@ -423,7 +441,7 @@ Example:
 %       }
 %       warn "layer values: ". Dumper($layer_values)
 %         if $opt{'debug'};
-%
+%	
 %       my @existing = &{ $include_sub }(
 %         'label'        => $ex_label,
 %         'fieldnum'     => $fieldnum,
@@ -531,10 +549,10 @@ Example:
 
           // only spawn if we're the last element... return if not
 
-          var field_regex = /(\d+)(_[a-z]+)?$/;
+          var field_regex = /(\d+)(_[a-z_]+)?$/;
           var match = field_regex.exec(what.name);
           if ( !match ) {
-            alert(what.name + " didn't match?!");
+            alert(what.name + " didn't match for " + what);
             return;
           }
           if ( match[1] != <%$field%>_fieldnum ) {
@@ -738,6 +756,7 @@ my $fields = $opt{'fields'}
              || [ grep { $_ ne $pkey } fields($table) ];
 #my @actualfields = map { ref($_) ? $_->{'field'} : $_ } @$fields;
 
+#$m->comp('/elements/handle_uri_query');
 if ( $cgi->param('redirect') ) {
   my $session = $cgi->param('redirect');
   my $pref = $curuser->option("redirect$session");