[freeside-commits] freeside/httemplate/edit/process/elements process.html, 1.15, 1.16

[Jeff Finucane,420,,]

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

Modified Files:
	process.html 
Log Message:
agent virtualize address blocks and routers

Index: process.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/elements/process.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- process.html	12 Jun 2008 21:53:31 -0000	1.15
+++ process.html	28 Jun 2008 19:25:24 -0000	1.16
@@ -33,7 +33,8 @@
 
    'clear_on_error' => [ 'form_field1', 'form_field2', ... ],
 
-                    #pass an arrayref of hashrefs for multiple m2ms or m2names
+                  #pass an arrayref of hashrefs for multiple m2ms or m2names
+                  #be certain you incorporate m2m_Common if you see error: param
 
    'process_m2m' => { 'link_table'   => 'link_table_name',
                       'target_table' => 'target_table_name',
@@ -176,6 +177,13 @@
 
 my $new = $class->new( \%hash );
 
+if ($old && exists($opt{'copy_on_empty'})) {
+  foreach my $field (@{$opt{'copy_on_empty'}}) {
+    $new->set($field, $old->get($field))
+      unless scalar($cgi->param($field));
+  }
+}
+
 if ( $opt{'agent_virt'} ) {
   die "illegal agentnum"
     unless $curuser->agentnums_href->{$new->agentnum}
@@ -184,13 +192,6 @@
            && $curuser->access_right($opt{'agent_null_right'});
 }
 
-if ($old && exists($opt{'copy_on_empty'})) {
-  foreach my $field (@{$opt{'copy_on_empty'}}) {
-    $new->set($field, $old->get($field))
-      unless scalar($cgi->param($field));
-  }
-}
-
 $error ||= $new->check;
 
 my @args = ();