From 42b2a5b6a4e8bf2a692467ae1e45d9dde2d614db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 18 Jan 2011 02:46:35 +0000
Subject: [PATCH] better export labeling for DID import, RT#11219

---
 FS/FS/part_export.pm                    | 11 +++++++++++
 httemplate/misc/phone_avail-import.html |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 6f5aedc35..c0d3c54a2 100644
--- 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 de280d0f9..c664c0726 100644
--- 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', },
-- 
2.11.0