Browse Source

AMBARI-7413. Slider View: Rename Frozen/Thaw to Stop/Start (Max Shepel via alexantonenko)

Alex Antonenko 10 years ago
parent
commit
edce1b29b0

+ 9 - 0
contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js

@@ -22,6 +22,14 @@
  */
 App.SliderAppsMapper = App.Mapper.createWithMixins(App.RunPeriodically, {
 
+  /**
+   * List of app state display names
+   */
+  stateMap: {
+    'FROZEN': 'STOPPED',
+    'THAWED': 'RUNNING'
+  },
+
   /**
    * Load data from <code>App.urlPrefix + this.urlSuffix</code> one time
    * @method load
@@ -207,6 +215,7 @@ App.SliderAppsMapper = App.Mapper.createWithMixins(App.RunPeriodically, {
           yarnId: app.yarnId,
           name: app.name,
           status: app.state,
+          displayStatus: self.stateMap[app.state] || app.state,
           user: app.user,
           started: app.startTime ? (new Date(app.startTime).toUTCString()) : "-",
           ended: app.endTime ? (new Date(app.endTime).toUTCString()) : "-",

+ 5 - 0
contrib/views/slider/src/main/resources/ui/app/models/slider_app.js

@@ -33,6 +33,11 @@ App.SliderApp = DS.Model.extend({
    */
   status: DS.attr('string'),
 
+  /**
+   * @type {displayStatus}
+   */
+  displayStatus: DS.attr('string'),
+
   /**
    * @type {string}
    */

+ 1 - 1
contrib/views/slider/src/main/resources/ui/app/templates/slider_app/summary.hbs

@@ -24,7 +24,7 @@
         <tbody>
         <tr>
           <td>{{t common.status}}</td>
-          <td>{{controller.model.status}}</td>
+          <td>{{controller.model.displayStatus}}</td>
         </tr>
         <tr>
           <td>{{t common.type}}</td>

+ 1 - 1
contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs

@@ -48,7 +48,7 @@
             {{/link-to}}
           </td>
 
-          <td>{{slider.status}}</td>
+          <td>{{slider.displayStatus}}</td>
 
           <td>{{slider.appType.displayName}}</td>