[freeside-commits] freeside/httemplate/edit/elements edit.html, 1.39.2.8, 1.39.2.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/elements
In directory wavetail.420.am:/tmp/cvs-serv8596/httemplate/edit/elements

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	edit.html 
Log Message:
simple protection against selecting and using package add-ons that point to the same package.  (still need to detect and break more complex self-referential loops)

Index: edit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/elements/edit.html,v
retrieving revision 1.39.2.8
retrieving revision 1.39.2.9
diff -u -w -d -r1.39.2.8 -r1.39.2.9
--- edit.html	13 Jul 2010 11:09:54 -0000	1.39.2.8
+++ edit.html	10 Oct 2010 20:52:38 -0000	1.39.2.9
@@ -290,7 +290,11 @@
 %
 %   #select-table
 %   $include_common{$_} = $f->{$_}
-%     foreach grep exists($f->{$_}), qw( value_col extra_sql );
+%     foreach grep exists($f->{$_}), qw( value_col );
+%   $include_common{$_} = ref( $f->{$_} ) eq 'CODE'
+%                           ? &{ $f->{$_} }( $cgi, $object ) #, $f )
+%                           : $f->{$_}
+%     foreach grep exists($f->{$_}), qw( extra_sql );
 %
 %   #select-table, checkboxes-table
 %   $include_common{$_} = $f->{$_}