diff --git a/deb/openmediavault/debian/changelog b/deb/openmediavault/debian/changelog index 01f66d5f4df..ac879895783 100644 --- a/deb/openmediavault/debian/changelog +++ b/deb/openmediavault/debian/changelog @@ -2,6 +2,7 @@ openmediavault (4.1.20-1) stable; urgency=low * Announce SMB/CIFS shares via WSD, so the are listed in Windows 10. * Issue #297: Extract upstream version for comparison. + * Issue #324: Fix typo in S.M.A.R.T. attributes data table. -- Volker Theile Sat, 16 Feb 2019 18:21:28 +0100 diff --git a/deb/openmediavault/usr/share/php/openmediavault/system/storage/smartinformation.inc b/deb/openmediavault/usr/share/php/openmediavault/system/storage/smartinformation.inc index 7268e4eea59..505ea345a79 100644 --- a/deb/openmediavault/usr/share/php/openmediavault/system/storage/smartinformation.inc +++ b/deb/openmediavault/usr/share/php/openmediavault/system/storage/smartinformation.inc @@ -218,7 +218,7 @@ class SmartInformation { "flags" => $matches[3], "value" => intval($matches[4]), "worst" => intval($matches[5]), - "treshold" => ("---" == $matches[6]) ? + "threshold" => ("---" == $matches[6]) ? 0 : intval($matches[6]), "whenfailed" => $matches[7], "rawvalue" => $matches[8], @@ -244,16 +244,16 @@ class SmartInformation { $attrData['assessment'] = self::SMART_ASSESSMENT_GOOD; // Always-Fail and Always-Passing thresholds are not relevant // for our assessment. - if (!(1 <= $attrData['treshold']) && (0xFD >= $attrData['treshold'])) { + if (!(1 <= $attrData['threshold']) && (0xFD >= $attrData['threshold'])) { $attrData['assessment'] = self::SMART_ASSESSMENT_BAD_STATUS; return; } // See https://wiki.ubuntuusers.de/Festplattenstatus - if ($attrData['value'] <= $attrData['treshold']) { + if ($attrData['value'] <= $attrData['threshold']) { $attrData['assessment'] = self::SMART_ASSESSMENT_BAD_ATTRIBUTE_NOW; return; } - if ($attrData['worst'] <= $attrData['treshold']) { + if ($attrData['worst'] <= $attrData['threshold']) { $attrData['assessment'] = self::SMART_ASSESSMENT_BAD_ATTRIBUTE_IN_THE_PAST; return; } diff --git a/deb/openmediavault/var/www/openmediavault/js/omv/module/admin/storage/smart/Devices.js b/deb/openmediavault/var/www/openmediavault/js/omv/module/admin/storage/smart/Devices.js index f68560fca0e..e26308e0af8 100644 --- a/deb/openmediavault/var/www/openmediavault/js/omv/module/admin/storage/smart/Devices.js +++ b/deb/openmediavault/var/www/openmediavault/js/omv/module/admin/storage/smart/Devices.js @@ -193,9 +193,9 @@ Ext.define("OMV.module.admin.storage.smart.device.information.Attributes", { width: 55, align: "center" },{ - text: _("Treshold"), - dataIndex: "treshold", - stateId: "treshold", + text: _("Threshold"), + dataIndex: "threshold", + stateId: "threshold", width: 55, align: "center" },{ @@ -254,7 +254,7 @@ Ext.define("OMV.module.admin.storage.smart.device.information.Attributes", { { name: "flags", type: "string" }, { name: "value", type: "int" }, { name: "worst", type: "int" }, - { name: "treshold", type: "int" }, + { name: "threshold", type: "int" }, { name: "whenfailed", type: "string" }, { name: "rawvalue", type: "string" }, { name: "description", type: "string" },