diff options
| author | Iftekharul Islam <iffy.ryan@ibm.com> | 2018-03-21 14:25:20 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-27 12:13:16 +0000 |
| commit | 7a5ce461fb91a2e10eb2ef15a2a9f6a9407e1564 (patch) | |
| tree | 56236dad266a8eafcce834c64303854aef7d21fa | |
| parent | 0e480f5591bbd87c6c2db97308d97f6bfdba39f5 (diff) | |
| download | phosphor-webui-7a5ce461fb91a2e10eb2ef15a2a9f6a9407e1564.tar.gz phosphor-webui-7a5ce461fb91a2e10eb2ef15a2a9f6a9407e1564.zip | |
Changing the text Quiesced to Error
As per discussion here openbmc/openbmc#2925
Changing the text Quiesced to Error
Fixes openbmc/openbmc#2925
Change-Id: Icd360a91335c8dd77cfbde4faa868cce6a286e64
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
| -rw-r--r-- | app/common/directives/app-header.html | 2 | ||||
| -rw-r--r-- | app/common/filters/index.js | 4 | ||||
| -rw-r--r-- | app/server-control/controllers/power-operations-controller.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/common/directives/app-header.html b/app/common/directives/app-header.html index 484d906..887af51 100644 --- a/app/common/directives/app-header.html +++ b/app/common/directives/app-header.html @@ -18,7 +18,7 @@ <a href="#/server-health/event-log" class="header__server-health">Server health <i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__error': dataService.server_health == 'Critical', 'status-light__warn': dataService.server_health == 'Warning', 'status-light__good': dataService.server_health == 'Good'}">{{dataService.server_health}}</span></a> <a href="#/server-control/power-operations" class="header__server-power" role="button">Server power - <i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__off': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__warn': dataService.server_state == 'Quiesced'}">{{dataService.server_state | quiescedToStandBy}}</span></a> + <i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__off': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__warn': dataService.server_state == 'Quiesced'}">{{dataService.server_state | quiescedToError}}</span></a> <p class="header__refresh">Data last refreshed<span>{{dataService.last_updated |date:'h:mm:ss MMM dd yyyy'}}</span> </p> <button class="header__page-refresh" ng-click="refresh()" aria-label="refresh page data"> diff --git a/app/common/filters/index.js b/app/common/filters/index.js index c840866..5c719fa 100644 --- a/app/common/filters/index.js +++ b/app/common/filters/index.js @@ -11,10 +11,10 @@ window.angular && (function (angular) { return data.length; } }) - .filter('quiescedToStandBy', function () { + .filter('quiescedToError', function () { return function (state) { if(state.toLowerCase() == 'quiesced'){ - return 'Standby'; + return 'Error'; }else{ return state; } diff --git a/app/server-control/controllers/power-operations-controller.html b/app/server-control/controllers/power-operations-controller.html index 9630e0d..660330e 100644 --- a/app/server-control/controllers/power-operations-controller.html +++ b/app/server-control/controllers/power-operations-controller.html @@ -10,7 +10,7 @@ <div class="row column"> <div id="power-indicator-bar" class="power__indicator-bar" ng-class="{'power__state-on': dataService.server_state == 'Running', 'power__state-off': dataService.server_state == 'Off', 'power__state-indet': dataService.server_state == 'Standby'}"> <p class="inline">{{dataService.hostname}} - {{dataService.server_id}}</p> - <h3 class="power__state inline no-margin h3"><span>{{dataService.server_state | quiescedToStandBy}}</span></h3> + <h3 class="power__state inline no-margin h3"><span>{{dataService.server_state | quiescedToError}}</span></h3> </div> </div> <div class="row column"> |
