Bläddra i källkod

AMBARI-3574 Reassign Master Wizard: first page empty. (akovalenko)

Aleksandr Kovalenko 11 år sedan
förälder
incheckning
9404fc0045

+ 1 - 0
ambari-web/app/messages.js

@@ -1084,6 +1084,7 @@ Em.I18n.translations = {
   'services.service.stopAll':'Stop All',
 
   'services.reassign.step1.header':'Prerequisites',
+  'services.reassign.step1.message':'{0} master component does not have any prerequisites.',
   'services.reassign.step2.header':'Assign Masters',
   'services.reassign.step3.header':'Review',
   'services.reassign.step3.body':'Please review the changes you made',

+ 1 - 1
ambari-web/app/routes/reassign_master_routes.js

@@ -75,7 +75,7 @@ module.exports = Em.Route.extend({
       controller.setCurrentStep('1');
       controller.dataLoading().done(function () {
         controller.loadAllPriorSteps();
-        controller.connectOutlet('reassignMasterWizardStep1');
+        controller.connectOutlet('reassignMasterWizardStep1', controller.get('content'));
       })
     },
     next: function (router) {

+ 3 - 0
ambari-web/app/templates/main/service/reassign/step1.hbs

@@ -17,6 +17,9 @@
 }}
 
 <h2>{{t services.reassign.step1.header}}</h2>
+<div class="alert alert-info">
+  {{view.message}}
+</div>
 <div class="btn-area">
   <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} &rarr;</a>
 </div>

+ 4 - 0
ambari-web/app/views/main/service/reassign/step1_view.js

@@ -21,6 +21,10 @@ var App = require('app');
 
 App.ReassignMasterWizardStep1View = Em.View.extend({
 
+  message: function () {
+    return Em.I18n.t('services.reassign.step1.message').format(this.get('controller.content.reassign.display_name'));
+  }.property('controller.content.reassign.display_name'),
+
   templateName: require('templates/main/service/reassign/step1')
 
 });