Merge pull request #1758 from phillxnet/1756_no_drive_name_on_custom_…

…smart_options_page no drive name on custom smart options and spin down pages. Fixes #1756
rockstor · Jul 18, 2017 · 93c9f22 · 93c9f22
2 parents 8417e63 + fc24702
commit 93c9f22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/smartcustom_disks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/smartcustom_disks.js
@@ -53,9 +53,10 @@ SmartcustomDiskView = RockstorLayoutView.extend({
         });
         var serialNumber = disk_obj.get('serial');
         var currentSmartCustom = disk_obj.get('smart_options');
+        var disk_name = disk_obj.get('name');
 
         $(this.el).html(this.template({
-            diskName: this.diskName,
+            diskName: disk_name,
             serialNumber: serialNumber,
             currentSmartCustom: currentSmartCustom
         }));

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/spindown_disks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/spindown_disks.js
@@ -91,9 +91,10 @@ SpindownDiskView = RockstorLayoutView.extend({
         var serialNumber = diskObj.get('serial');
         var hdparmSetting = diskObj.get('hdparm_setting');
         var apmLevel = diskObj.get('apm_level');
+        var disk_name = diskObj.get('name');
 
         $(this.el).html(this.template({
-            diskName: diskObj.name,
+            diskName: disk_name,
             serialNumber: serialNumber,
             spindownTimes: spindownTimes,
             hdparmSetting: hdparmSetting,