[freeside-commits] branch FREESIDE_4_BRANCH updated. dfedd920db6c72b1aebc198af9d11387f416aa7b

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  dfedd920db6c72b1aebc198af9d11387f416aa7b (commit)
      from  08cd3c70a46c93f72a05c1df99d700c7fc07f768 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dfedd920db6c72b1aebc198af9d11387f416aa7b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 18 13:56:12 2016 -0700

    Fix Prospect edit, from Fernando-Kiernan

diff --git a/httemplate/edit/prospect_main.html b/httemplate/edit/prospect_main.html
index 7c02538..6aefe80 100644
--- a/httemplate/edit/prospect_main.html
+++ b/httemplate/edit/prospect_main.html
@@ -34,8 +34,10 @@
        { 'field'             => 'contactnum',
          'type'              => 'contact',
          'colspan'           => 7,
-         'o2m_table'      => 'contact',
-         'm2_label'       => 'Contact',
+         'prospectnum'       => $prospectnum,
+         'm2m_method'        => 'prospect_contact',
+         'm2m_dstcol'        => 'contactnum',
+         'm2_label'          => 'Contact',
          'm2_error_callback' => $m2_error_callback,
 
        },
@@ -69,18 +71,25 @@ my $conf = new FS::Conf;
 
 my $prospectnum;
 if ( $cgi->param('error') ) {
-  $prospectnum = scalar($cgi->param('prospectnum'));
+  $cgi->param('prospectnum') =~ /^(\d*)$/ or die 'illegal prospectnum';
+  $prospectnum = $1;
 
   die "access denied"
     unless $curuser->access_right(($prospectnum ? 'Edit' : 'New'). ' prospect');
 
 } elsif ( $cgi->keywords ) { #editing
 
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ or die 'no prospectnum';
+  $prospectnum = $1;
+
   die "access denied"
     unless $curuser->access_right('Edit prospect');
 
 } else { #new prospect 
 
+  $prospectnum = '';
+
   die "access denied"
     unless $curuser->access_right('New prospect');
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/prospect_main.html |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)