projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
self-service ticket priority and edit subject, #13199
[freeside.git]
/
FS
/
FS
/
part_export.pm
diff --git
a/FS/FS/part_export.pm
b/FS/FS/part_export.pm
index
588606d
..
d3068df
100644
(file)
--- a/
FS/FS/part_export.pm
+++ b/
FS/FS/part_export.pm
@@
-50,6
+50,8
@@
fields are currently supported:
=item exportnum - primary key
=item exportnum - primary key
+=item exportname - Descriptive name
+
=item machine - Machine name
=item exporttype - Export type
=item machine - Machine name
=item exporttype - Export type
@@
-159,6
+161,7
@@
sub check {
my $self = shift;
my $error =
$self->ut_numbern('exportnum')
my $self = shift;
my $error =
$self->ut_numbern('exportnum')
+ || $self->ut_textn('exportname')
|| $self->ut_domain('machine')
|| $self->ut_alpha('exporttype')
;
|| $self->ut_domain('machine')
|| $self->ut_alpha('exporttype')
;
@@
-174,6
+177,17
@@
sub check {
$self->SUPER::check;
}
$self->SUPER::check;
}
+=item label
+
+Returns a label for this export, "exportname||exportype (machine)".
+
+=cut
+
+sub label {
+ my $self = shift;
+ ($self->exportname || $self->exporttype ). ' ('. $self->machine. ')';
+}
+
#=item part_svc
#
#Returns the service definition (see L<FS::part_svc>) for this export.
#=item part_svc
#
#Returns the service definition (see L<FS::part_svc>) for this export.
@@
-448,7
+462,7
@@
foreach my $INC ( @INC ) {
}
unless ( keys %$info ) {
warn "no %info hash found in FS::part_export::$mod, skipping\n"
}
unless ( keys %$info ) {
warn "no %info hash found in FS::part_export::$mod, skipping\n"
- unless $mod =~ /^(passwdfile|null)$/; #hack but what the heck
+ unless $mod =~ /^(passwdfile|null
|.+_Common
)$/; #hack but what the heck
next;
}
warn "got export info from FS::part_export::$mod: $info\n" if $DEBUG;
next;
}
warn "got export info from FS::part_export::$mod: $info\n" if $DEBUG;