X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fedit.html;h=b19b3618c96ddca26b0e33c6625a23cb5db2de63;hb=995a145c931164347683071c95c6754379d36604;hp=9e5c4e03c699dc79e0efa24aead6f60ba1b6c271;hpb=5b29227d64e62b6f056c4bcec0a3e0a82269a3e5;p=freeside.git

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 9e5c4e03c..b19b3618c 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -40,7 +40,7 @@ Example:
                     'disabled' => 0,
                     'onchange' => 'javascript_function',
 
-                    'include_opt_callback' => sub { #my $ = @_;
+                    'include_opt_callback' => sub { my $object = @_;
                                                     ( 'option' => 'value', );
                                                   },
 
@@ -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
@@ -129,6 +130,9 @@ Example:
                            "html_string";
                          },
     
+    #javascript function name, will be called with form name as arg
+    'onsubmit'   => 'check_form_data',
+
     #at the very bottom (well, as low as you can go from here)
     'html_foot'  => '',
 
@@ -201,7 +205,11 @@ Example:
 
 % my $url = $opt{'post_url'} || popurl(1)."process/$table.html";
 
-<FORM ACTION="<% $url %>" METHOD=POST NAME="edit_topform">
+<FORM NAME   = "edit_topform"
+      METHOD = POST
+      ACTION = "<% $url %>"
+      <% $opt{onsubmit} ? 'onSubmit="return '.$opt{onsubmit}.'(this)"' : '' %>
+>
 
 <INPUT TYPE="hidden" NAME="svcdb" VALUE="<% $table %>">
 <INPUT TYPE="hidden" NAME="<% $pkey %>" VALUE="<% $clone ? '' : $object->$pkey() %>">
@@ -282,9 +290,13 @@ Example:
 %   $include_common{$_} = $f->{$_}
 %     foreach grep exists($f->{$_}), qw( empty_label );
 %
+%   #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 value_col );
+%     foreach grep exists($f->{$_}), qw( table name_col  );
 %
 %   #checkboxes-table
 %   $include_common{$_} = $f->{$_}
@@ -292,15 +304,25 @@ Example:
 %
 %   #*-table
 %   $include_common{$_} = $f->{$_}
-%     foreach grep exists($f->{$_}), qw( hashref agent_virt agent_null_right );
+%     foreach grep exists($f->{$_}),
+%       qw( hashref agent_virt agent_null agent_null_right );
+%
+%   #htmlarea
+%   $include_common{$_} = $f->{$_}
+%     foreach grep exists($f->{$_}), qw( width height );
+%
 %
 %   if ( $type eq 'tablebreak-tr-title' ) {
 %     $include_common{'table_id'} = 'TableNumber'. $tablenum++;
+%   }
+%   if ( $type eq 'tablebreak-tr-title' || $type eq 'title' ) {
 %     $include_common{'colspan'} = $f->{colspan} if $f->{colspan};
 %   }
 %
 %   if ( $f->{include_opt_callback} ) {
-%     %include_common = ( %include_common, &{ $f->{include_opt_callback} } );
+%     %include_common = ( %include_common,
+%                         &{ $f->{include_opt_callback} }( $object )
+%                       );
 %   }
 %
 %   my $layer_prefix_on = '';
@@ -373,7 +395,7 @@ Example:
 %       $table = $f->{'m2name_table'};
 %       $col   = $f->{'m2name_namecol'};
 %     } elsif ( $f->{'o2m_table'} ) {
-%       $table = $f->{'o2m_tbekable'};
+%       $table = $f->{'o2m_table'};
 %       $col   = dbdef->table($f->{'o2m_table'})->primary_key;
 %     } elsif ( $f->{'m2m_method'} ) {
 %       $table = $f->{'m2m_method'};
@@ -519,7 +541,7 @@ Example:
           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 ) {
@@ -544,8 +566,9 @@ Example:
 
           var newrow =  <% include(@layer_opt, html_only=>1) |js_string %>;
 
-%         if ( $type eq 'selectlayers' ) { #until the rest have html/js_only
-            var newfunc = <% include(@layer_opt, js_only  =>1) |js_string %>;
+%         #until the rest have html/js_only
+%         if ( $type eq 'selectlayers' || $type =~ /^select-cgp_rule_/ ) {
+            var newfunc = <% include(@layer_opt, js_only=>1) |js_string %>;
 %         } else {
             var newfunc = '';
 %         }
@@ -691,7 +714,13 @@ Example:
 
 <BR>
 
-<INPUT TYPE="submit" ID="submit" VALUE="<% ( !$clone && $object->$pkey() ) ? "Apply changes" : "Add ". ( $opt{'name'} || $opt{'name_singular'} ) %>">
+<INPUT TYPE     = "submit"
+       ID       = "submit"
+       VALUE    = "<% ( !$clone && $object->$pkey() )
+                        ? "Apply changes"
+                        : "Add ". ( $opt{'name'} || $opt{'name_singular'} )
+                   %>"
+>
 
 </FORM>