better export labeling for DID import, RT#11219

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 6f5aedc..c0d3c54 100644 (file)
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -177,6 +177,17 @@ sub 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.

diff --git a/httemplate/misc/phone_avail-import.html b/httemplate/misc/phone_avail-import.html
index de280d0..c664c07 100644 (file)
--- a/httemplate/misc/phone_avail-import.html
+++ b/httemplate/misc/phone_avail-import.html
@@ -21,7 +21,8 @@ Import a file containing phone numbers (DIDs).
 
   <% include( '/elements/tr-select-table.html',
                 'table'       => 'part_export',
-                'name_col'    => 'machine',
+                'name_col'    => 'label',
+                'order_by'    => 'ORDER BY exportname, machine',
                 'label'       => 'Export',
                 'empty_label' => 'Select export',
                 'hashref'     => { 'exporttype' => 'internal_diddb', },