diff options
| author | Gunnar Mills <gmills@us.ibm.com> | 2018-04-13 14:56:41 -0500 |
|---|---|---|
| committer | Gunnar Mills <gmills@us.ibm.com> | 2018-04-19 18:45:16 +0000 |
| commit | 5dbcfb173ef5d08a481a44218573a2bfbbb2b7d5 (patch) | |
| tree | d45350529d294740663c94271333e639e2844868 /app/overview | |
| parent | 17708f2aa210833edfa8a90c14b761e58592bffa (diff) | |
| download | phosphor-webui-5dbcfb173ef5d08a481a44218573a2bfbbb2b7d5.tar.gz phosphor-webui-5dbcfb173ef5d08a481a44218573a2bfbbb2b7d5.zip | |
Move bmc_firmware to displayBMCInfo
Before setting the BMC firmware was in displayServerInfo
Tested: Verified the BMC firmware still displays correctly.
Change-Id: Ic6323bc9eec700ff5956868899ccda398a841274
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'app/overview')
| -rw-r--r-- | app/overview/controllers/system-overview-controller.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js index 812218c..2e27a66 100644 --- a/app/overview/controllers/system-overview-controller.js +++ b/app/overview/controllers/system-overview-controller.js @@ -50,12 +50,14 @@ window.angular && (function (angular) { $scope.displayLogs(data.logs.data); $scope.displayServerInfo( data.server_info, - data.firmware.bmcActiveVersion, data.firmware.hostActiveVersion ); $scope.displayLEDState(data.led); $scope.displayBMCEthernetInfo(data.ethernet); - $scope.displayBMCInfo(data.bmc_info); + $scope.displayBMCInfo( + data.bmc_info, + data.firmware.bmcActiveVersion + ); $scope.displayPowerConsumption(data.power_consumption); $scope.displayPowerCap(data.power_cap); }) @@ -67,8 +69,9 @@ window.angular && (function (angular) { $scope.mac_address = data.MACAddress; } - $scope.displayBMCInfo = function(data){ + $scope.displayBMCInfo = function(data, bmcActiveVersion){ $scope.bmc_info = data; + $scope.bmc_firmware = bmcActiveVersion; } $scope.displayLogs = function(data){ @@ -77,9 +80,8 @@ window.angular && (function (angular) { }); } - $scope.displayServerInfo = function(data, bmcActiveVersion, hostActiveVersion){ + $scope.displayServerInfo = function(data, hostActiveVersion){ $scope.server_info = data.data; - $scope.bmc_firmware = bmcActiveVersion; $scope.server_firmware = hostActiveVersion; } |

