X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fedit.html;h=4159f0407efa2403b35c095d7eec8ac625ec4c6c;hb=89cea41d2bd7887a5b6b067ea5fb3f7bfa3b1a26;hp=1ed75c3ef4a04a8be8e83d49cbb112540ef68e82;hpb=8d534e61d74e561a15f0863a835cda4af639a9ea;p=freeside.git

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 1ed75c3ef..4159f0407 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
@@ -182,7 +182,7 @@ Example:
     #run before display to manipulate element of the 'fields' arrayref
     'field_callback' => sub { my( $cgi, $object, $field_hashref ) = @_; },
 
-  );
+  &>
 
 </%doc>
 
@@ -260,14 +260,22 @@ 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'},
 %
+%     #fixed
+%     'noescape'      => $f->{'noescape'},
+%
 %     #select(-*)
 %     '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'},
@@ -279,15 +287,17 @@ Example:
 %
 %     #umm.  for select-agent_types at least
 %     'disabled'      => $f->{'disabled'},
+%     'fixed'         => $f->{'fixed'},
 %
 %     #any?
 %     'colspan'       => $f->{'colspan'},
+%     'required'      => $f->{'required'},
 %   );
 %
 %   $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( value_col compare_sub ),                         # 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
@@ -435,7 +445,7 @@ Example:
 %       }
 %       warn "layer values: ". Dumper($layer_values)
 %         if $opt{'debug'};
-%
+%	
 %       my @existing = &{ $include_sub }(
 %         'label'        => $ex_label,
 %         'fieldnum'     => $fieldnum,
@@ -483,7 +493,7 @@ Example:
 %     if ( $f->{curr_value_callback} ) {
 %       $curr_value = &{ $f->{curr_value_callback} }( $cgi, $object, $field ),
 %     } else {
-%       $curr_value = $object->$field();
+%       $curr_value = $object->$field() if $field;
 %     }
 %     $curr_value = &{ $opt{'value_callback'} }( $f->{'field'}, $curr_value )
 %       if $opt{'value_callback'} && $mode ne 'error';
@@ -543,7 +553,7 @@ 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 for " + what);
@@ -719,13 +729,15 @@ Example:
 
 <BR>
 
-<INPUT TYPE     = "submit"
-       ID       = "submit"
-       VALUE    = "<% ( !$clone && $object->$pkey() )
-                        ? "Apply changes"
-                        : "Add ". ( $opt{'name'} || $opt{'name_singular'} )
-                   %>"
->
+% unless ($opt{'no_submit'}) {
+  <INPUT TYPE     = "submit"
+         ID       = "submit"
+         VALUE    = "<% ( !$clone && $object->$pkey() )
+                          ? "Apply changes"
+                          : "Add ". ( $opt{'name'} || $opt{'name_singular'} )
+                     %>"
+  >
+% }
 
 </FORM>
 
@@ -750,6 +762,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");