Quellcode durchsuchen

AMBARI-7841. Slider View: Show slider-view user beside the Create App page. (akovalenko)

Aleksandr Kovalenko vor 11 Jahren
Ursprung
Commit
a1ba750e85

+ 1 - 0
contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js

@@ -53,6 +53,7 @@ App.SliderController = Ember.Controller.extend(App.RunPeriodically, {
     App.set('description', Em.get(data, 'ViewInstanceInfo.description'));
     App.set('label', Em.get(data, 'ViewInstanceInfo.label'));
     App.set('javaHome', Em.get(data, 'ViewInstanceInfo.instance_data') && Em.get(data, 'ViewInstanceInfo.instance_data')['java.home']);
+    App.set('sliderUser', data.ViewInstanceInfo.properties['slider.user']);
   },
 
   /**

+ 5 - 0
contrib/views/slider/src/main/resources/ui/app/styles/app.less

@@ -273,4 +273,9 @@
   .component-label {
     line-height: 28px;
   }
+}
+
+.view-user {
+  line-height: 34px;
+  padding-right: 10px;
 }

+ 8 - 3
contrib/views/slider/src/main/resources/ui/app/templates/application.hbs

@@ -36,10 +36,15 @@
 
 <div class="slider-header">
   {{#view view.SliderTitleView}}
-      <h3 class="pull-left" id="slider-title"><span class="slider-app-title">{{App.label}}</span></h3>
+    <h3 class="pull-left" id="slider-title"><span class="slider-app-title">{{App.label}}</span></h3>
     {{#if view.showCreateAppButton}}
       <div class="box-header pull-right">
-        <div class="create-app">
+        {{#if App.sliderUser}}
+          <div class="pull-left view-user">
+            <i class="icon-user"></i>&nbsp;{{App.sliderUser}}
+          </div>
+        {{/if}}
+        <div class="create-app pull-right">
           <a href="#" class="btn btn-primary" {{action createApp}}>
             <i class="icon-plus"></i><span>&nbsp;{{t slider.apps.create}}</span>
           </a>
@@ -50,4 +55,4 @@
   {{outlet bs-tooltip-box}}
 </div>
 
-{{outlet}}
+{{outlet}}

+ 5 - 2
contrib/views/slider/src/main/resources/ui/test/integration/pages/index_test.js

@@ -24,7 +24,10 @@ QUnit.module('integration/pages - index', {
       "ViewInstanceInfo": {
         "context_path": "/views/SLIDER/1.0.0/s1",
         "description": "DESCRIPTION",
-        "label": "SLIDER LABEL"
+        "label": "SLIDER LABEL",
+        "properties": {
+          "slider.user": "admin"
+        }
       }
     });
     Ember.run(App, App.advanceReadiness);
@@ -120,4 +123,4 @@ test('Clear Filters', function () {
     });
   });
 
-});
+});

+ 4 - 1
contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step3_controller_test.js

@@ -46,6 +46,9 @@ test('initConfigs', function () {
       "ViewInstanceInfo" : {
         "instance_data": {
           "java.home": "/usr/jdk64/jdk1.7.0_45"
+        },
+        "properties": {
+          "slider.user": "admin"
         }
       }
     });
@@ -56,4 +59,4 @@ test('initConfigs', function () {
 
   equal(controller.get('configs').findBy('label', 'java_home').get('value'), '/usr/jdk64/jdk1.7.0_45', 'should set default java_home property value');
 
-});
+});

+ 4 - 0
contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js

@@ -28,6 +28,9 @@ test('getViewDisplayParametersSuccessCallback', function () {
         "label" : "display s1",
         "instance_data": {
           "java.home": "/usr/jdk64/jdk1.7.0_45"
+        },
+        "properties": {
+          "slider.user": "admin"
         }
       }
     })
@@ -35,5 +38,6 @@ test('getViewDisplayParametersSuccessCallback', function () {
   equal(App.get('label'), 'display s1', 'valid label is set');
   equal(App.get('description'), 'description s1', 'valid description is set');
   equal(App.get('javaHome'), '/usr/jdk64/jdk1.7.0_45', 'valid default java_home property is set');
+  equal(App.get('sliderUser'), 'admin', 'valid sliderUser is set');
 
 });