[freeside-commits] freeside/FS/FS Schema.pm, 1.168.2.24, 1.168.2.25 mailinglistmember.pm, 1.1.2.2, 1.1.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv19457

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Schema.pm mailinglistmember.pm 
Log Message:
fix mailinglistmember.pm dependency on contact_email.pm from 2.1 branch, RT#7897

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.24
retrieving revision 1.168.2.25
diff -u -w -d -r1.168.2.24 -r1.168.2.25
--- Schema.pm	23 Mar 2010 03:47:58 -0000	1.168.2.24
+++ Schema.pm	26 Mar 2010 02:28:06 -0000	1.168.2.25
@@ -2585,12 +2585,11 @@
         'membernum',        'serial',     '',   '', '', '',
         'listnum',             'int',     '',   '', '', '',
         'svcnum',              'int', 'NULL',   '', '', '', 
-        'contactemailnum',     'int', 'NULL',   '', '', '', 
         'email',           'varchar', 'NULL',  255, '', '', 
       ],
       'primary_key' => 'membernum',
       'unique'      => [],
-      'index'       => [['listnum'],['svcnum'],['contactemailnum'],['email']],
+      'index'       => [['listnum'],['svcnum'],['email']],
     },
 
 

Index: mailinglistmember.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/mailinglistmember.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -d -r1.1.2.2 -r1.1.2.3
--- mailinglistmember.pm	23 Mar 2010 09:13:33 -0000	1.1.2.2
+++ mailinglistmember.pm	26 Mar 2010 02:28:06 -0000	1.1.2.3
@@ -6,7 +6,6 @@
 use FS::Record qw( dbh qsearchs ); # qsearch );
 use FS::mailinglist;
 use FS::svc_acct;
-use FS::contact_email;
 
 =head1 NAME
 
@@ -47,10 +46,6 @@
 
 svcnum
 
-=item contactemailnum
-
-contactemailnum
-
 =item email
 
 email
@@ -193,7 +188,6 @@
     $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;
@@ -216,7 +210,7 @@
 
 sub email_address {
   my $self = shift;
-  #XXX svcnum, contactemailnum
+  #XXX svcnum
   $self->email;
 }