projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4d22080
)
fix mailinglistmember.pm dependency on contact_email.pm from 2.1 branch, RT#7897
author
ivan
<ivan>
Fri, 26 Mar 2010 02:28:06 +0000
(
02:28
+0000)
committer
ivan
<ivan>
Fri, 26 Mar 2010 02:28:06 +0000
(
02:28
+0000)
FS/FS/Schema.pm
patch
|
blob
|
history
FS/FS/mailinglistmember.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Schema.pm
b/FS/FS/Schema.pm
index
8cadaa7
..
dde4053
100644
(file)
--- a/
FS/FS/Schema.pm
+++ b/
FS/FS/Schema.pm
@@
-2585,12
+2585,11
@@
sub tables_hashref {
'membernum', 'serial', '', '', '', '',
'listnum', 'int', '', '', '', '',
'svcnum', 'int', 'NULL', '', '', '',
'membernum', 'serial', '', '', '', '',
'listnum', 'int', '', '', '', '',
'svcnum', 'int', 'NULL', '', '', '',
- 'contactemailnum', 'int', 'NULL', '', '', '',
'email', 'varchar', 'NULL', 255, '', '',
],
'primary_key' => 'membernum',
'unique' => [],
'email', 'varchar', 'NULL', 255, '', '',
],
'primary_key' => 'membernum',
'unique' => [],
- 'index' => [['listnum'],['svcnum'],['
contactemailnum'],['
email']],
+ 'index' => [['listnum'],['svcnum'],['email']],
},
},
diff --git
a/FS/FS/mailinglistmember.pm
b/FS/FS/mailinglistmember.pm
index
49688d8
..
8655d61
100644
(file)
--- a/
FS/FS/mailinglistmember.pm
+++ b/
FS/FS/mailinglistmember.pm
@@
-6,7
+6,6
@@
use Scalar::Util qw( blessed );
use FS::Record qw( dbh qsearchs ); # qsearch );
use FS::mailinglist;
use FS::svc_acct;
use FS::Record qw( dbh qsearchs ); # qsearch );
use FS::mailinglist;
use FS::svc_acct;
-use FS::contact_email;
=head1 NAME
=head1 NAME
@@
-47,10
+46,6
@@
listnum
svcnum
svcnum
-=item contactemailnum
-
-contactemailnum
-
=item email
email
=item email
email
@@
-193,7
+188,6
@@
sub check {
$self->ut_numbern('membernum')
|| $self->ut_foreign_key('listnum', 'mailinglist', 'listnum')
|| $self->ut_foreign_keyn('svcnum', 'svc_acct', 'svcnum')
$self->ut_numbern('membernum')
|| $self->ut_foreign_key('listnum', 'mailinglist', 'listnum')
|| $self->ut_foreign_keyn('svcnum', 'svc_acct', 'svcnum')
- || $self->ut_foreign_keyn('contactemailnum', 'contact_email', 'contactemailnum')
|| $self->ut_textn('email') #XXX ut_email! from svc_forward, cust_main_invoice
;
return $error if $error;
|| $self->ut_textn('email') #XXX ut_email! from svc_forward, cust_main_invoice
;
return $error if $error;
@@
-216,7
+210,7
@@
sub mailinglist {
sub email_address {
my $self = shift;
sub email_address {
my $self = shift;
- #XXX svcnum
, contactemailnum
+ #XXX svcnum
$self->email;
}
$self->email;
}