Add device node name information to the storage spoke and disk cart (#902617).

4 files changed, 15 insertions, 15 deletions

diff --git a/pyanaconda/ui/gui/spokes/lib/cart.glade b/pyanaconda/ui/gui/spokes/lib/cart.glade
index 0743a9f33..0e234a2da 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.glade
+++ b/pyanaconda/ui/gui/spokes/lib/cart.glade
@@ -11,7 +11,7 @@
       <column type="gchararray"/>
       <!-- column-name free -->
       <column type="gchararray"/>
-      <!-- column-name id -->
+      <!-- column-name name -->
       <column type="gchararray"/>
       <!-- column-name unique -->
       <column type="gint"/>
@@ -158,11 +158,11 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkTreeViewColumn" id="id_column">
+                          <object class="GtkTreeViewColumn" id="name_column">
                             <property name="spacing">6</property>
-                            <property name="title" translatable="yes">Id</property>
+                            <property name="title" translatable="yes">Name</property>
                             <child>
-                              <object class="GtkCellRendererText" id="id_renderer"/>
+                              <object class="GtkCellRendererText" id="name_renderer"/>
                               <attributes>
                                 <attribute name="text">4</attribute>
                               </attributes>
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py
index bdc4fafcc..0fe98698f 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.py
+++ b/pyanaconda/ui/gui/spokes/lib/cart.py
@@ -36,7 +36,7 @@ IS_BOOT_COL = 0
 DESCRIPTION_COL = 1
 SIZE_COL = 2
 FREE_SPACE_COL = 3
-SERIAL_COL = 4
+NAME_COL = 4
 ID_COL = 5
 
 def size_str(mb):
@@ -57,10 +57,10 @@ class SelectedDisksDialog(GUIObject):
 
         for disk in disks:
             self._store.append([False,
-                                disk.description,
+                                "%s (%s)" % (disk.description, disk.serial),
                                 size_str(disk.size),
                                 size_str(free[disk.name][0]),
-                                disk.serial,
+                                disk.name,
                                 disk.id])
         self.disks = disks[:]
         self._update_summary()
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 84315a14f..87ebb898e 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -703,8 +703,7 @@ class SourceSpoke(NormalSpoke):
         if cdrom:
             @gtk_thread_wait
             def gtk_action_1():
-                selector = AnacondaWidgets.DiskOverview(cdrom.format.label or "", "drive-removable-media", "")
-                selector.path = cdrom.path
+                selector = AnacondaWidgets.DiskOverview(cdrom.format.label or "", "drive-removable-media", "", cdrom.name)
                 selector.set_chosen(chosen)
                 self._autodetectMediaBox.pack_start(selector, False, False, 0)
 
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 0155c83a1..69ed7fdee 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -489,7 +489,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         # update the selections in the ui
         overviews = self.local_disks_box.get_children()
         for overview in overviews:
-            name = overview.get_property("popup-info").partition("|")[0].strip()
+            name = overview.get_property("name")
             overview.set_chosen(name in self.selected_disks)
 
         self._update_summary()
@@ -531,13 +531,14 @@ class StorageSpoke(NormalSpoke, StorageChecker):
                 kind = "drive-harddisk"
 
             size = size_str(disk.size)
-            popup_info = "%s | %s" % (disk.name, disk.serial)
+            popup_info = "%s" % disk.serial
 
             @gtk_thread_wait
             def gtk_action():
                 overview = AnacondaWidgets.DiskOverview(disk.description,
                                                         kind,
                                                         size,
+                                                        disk.name,
                                                         popup=popup_info)
                 self.local_disks_box.pack_start(overview, False, False, 0)
 
@@ -553,7 +554,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
                 self._update_summary()
 
             gtk_action()
-                
+
         self._ready = True
         communication.send_ready(self.__class__.__name__)
 
@@ -593,9 +594,9 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         """ Update self.selected_disks based on the UI. """
         overviews = self.local_disks_box.get_children()
         for overview in overviews:
-            name = overview.get_property("popup-info").partition("|")[0].strip()
-
             selected = overview.get_chosen()
+            name = overview.get_property("name")
+
             if selected and name not in self.selected_disks:
                 self.selected_disks.append(name)
 
@@ -618,7 +619,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         # update the UI to reflect changes to self.selected_disks
         overviews = self.local_disks_box.get_children()
         for overview in overviews:
-            name = overview.get_property("popup-info").partition("|")[0].strip()
+            name = overview.get_property("name")
 
             overview.set_chosen(name in self.selected_disks)