projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6bfaf79
)
fix new duplicate username checking
author
ivan
<ivan>
Wed, 12 Jun 2002 20:31:28 +0000
(20:31 +0000)
committer
ivan
<ivan>
Wed, 12 Jun 2002 20:31:28 +0000
(20:31 +0000)
FS/FS/svc_acct.pm
patch
|
blob
|
history
diff --git
a/FS/FS/svc_acct.pm
b/FS/FS/svc_acct.pm
index
03230dd
..
ce76fe5
100644
(file)
--- a/
FS/FS/svc_acct.pm
+++ b/
FS/FS/svc_acct.pm
@@
-194,12
+194,25
@@
sub insert {
return $error if $error;
#no, duplicate checking just got a whole lot more complicated
return $error if $error;
#no, duplicate checking just got a whole lot more complicated
+ #(perhaps keep this check with a config option to turn on?)
#return gettext('username_in_use'). ": ". $self->username
# if qsearchs( 'svc_acct', { 'username' => $self->username,
# 'domsvc' => $self->domsvc,
# } );
#return gettext('username_in_use'). ": ". $self->username
# if qsearchs( 'svc_acct', { 'username' => $self->username,
# 'domsvc' => $self->domsvc,
# } );
+ if ( $self->svcnum ) {
+ my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
+ unless ( $cust_svc ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "no cust_svc record found for svcnum ". $self->svcnum;
+ }
+ $self->pkgnum($cust_svc->pkgnum);
+ $self->svcpart($cust_svc->svcpart);
+ }
+
+ #new duplicate username checking
+
my @dup_user = qsearch( 'svc_acct', { 'username' => $self->username } );
my @dup_userdomain = qsearchs( 'svc_acct', { 'username' => $self->username,
'domsvc' => $self->domsvc } );
my @dup_user = qsearch( 'svc_acct', { 'username' => $self->username } );
my @dup_userdomain = qsearchs( 'svc_acct', { 'username' => $self->username,
'domsvc' => $self->domsvc } );
@@
-208,13
+221,19
@@
sub insert {
my $exports = FS::part_export::export_info('svc_acct');
my( %conflict_user_svcpart, %conflict_userdomain_svcpart );
my $exports = FS::part_export::export_info('svc_acct');
my( %conflict_user_svcpart, %conflict_userdomain_svcpart );
- foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+ my $part_svc = qsearchs('part_svc', { 'svcpart' => $self->svcpart } );
+ unless ( $part_svc ) {
+ $dbh->rollback if $oldAutoCommit;
+ return 'unknown svcpart '. $self->svcpart;
+ }
+
+ foreach my $part_export ( $part_svc->part_export ) {
#this will catch to the same exact export
my @svcparts = map { $_->svcpart }
qsearch('export_svc', { 'exportnum' => $part_export->exportnum });
#this will catch to the same exact export
my @svcparts = map { $_->svcpart }
qsearch('export_svc', { 'exportnum' => $part_export->exportnum });
- #this will catch exports w/same exporthost+type ???
+ #this will catch
to
exports w/same exporthost+type ???
#my @other_part_export = qsearch('part_export', {
# 'machine' => $part_export->machine,
# 'exporttype' => $part_export->exporttype,
#my @other_part_export = qsearch('part_export', {
# 'machine' => $part_export->machine,
# 'exporttype' => $part_export->exporttype,
@@
-255,16
+274,6
@@
sub insert {
#see? i told you it was more complicated
#see? i told you it was more complicated
- if ( $self->svcnum ) {
- my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
- unless ( $cust_svc ) {
- $dbh->rollback if $oldAutoCommit;
- return "no cust_svc record found for svcnum ". $self->svcnum;
- }
- $self->pkgnum($cust_svc->pkgnum);
- $self->svcpart($cust_svc->svcpart);
- }
-
my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
return "Unknown svcpart" unless $part_svc;
return "uid in use"
my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
return "Unknown svcpart" unless $part_svc;
return "uid in use"
@@
-379,8
+388,6
@@
sub delete {
}
}
}
}
- my $part_svc = $self->cust_svc->part_svc;
-
my $error = $self->SUPER::delete;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
my $error = $self->SUPER::delete;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;