projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tower UI, coverage map, etc.
[freeside.git]
/
httemplate
/
edit
/
prospect_main.html
diff --git
a/httemplate/edit/prospect_main.html
b/httemplate/edit/prospect_main.html
index
fb67515
..
6aefe80
100644
(file)
--- a/
httemplate/edit/prospect_main.html
+++ b/
httemplate/edit/prospect_main.html
@@
-34,8
+34,10
@@
{ 'field' => 'contactnum',
'type' => 'contact',
'colspan' => 7,
{ '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,
},
'm2_error_callback' => $m2_error_callback,
},
@@
-50,6
+52,7
@@
},
{ 'field' => 'taxstatusnum',
'type' => 'select-tax_status',
},
{ 'field' => 'taxstatusnum',
'type' => 'select-tax_status',
+ 'required' => 1,
'empty_label' => ' ',
},
],
'empty_label' => ' ',
},
],
@@
-68,18
+71,25
@@
my $conf = new FS::Conf;
my $prospectnum;
if ( $cgi->param('error') ) {
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
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
die "access denied"
unless $curuser->access_right('Edit prospect');
} else { #new prospect
+ $prospectnum = '';
+
die "access denied"
unless $curuser->access_right('New prospect');
die "access denied"
unless $curuser->access_right('New prospect');