Updated Branches: refs/heads/trunk 1bee56a9b -> 9404fc004
AMBARI-3574 Reassign Master Wizard: first page empty. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/9404fc00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/9404fc00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/9404fc00 Branch: refs/heads/trunk Commit: 9404fc004546a674ae329811a0a0eab1f379fc91 Parents: 1bee56a Author: Aleksandr Kovalenko <[email protected]> Authored: Tue Oct 22 18:06:19 2013 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Tue Oct 22 18:06:19 2013 +0300 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + ambari-web/app/routes/reassign_master_routes.js | 2 +- ambari-web/app/templates/main/service/reassign/step1.hbs | 3 +++ ambari-web/app/views/main/service/reassign/step1_view.js | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9404fc00/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 7830d70..5aff45c 100644 --- a/ambari-web/app/messages.js +++ b/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', http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9404fc00/ambari-web/app/routes/reassign_master_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/reassign_master_routes.js b/ambari-web/app/routes/reassign_master_routes.js index a283dae..bf862a8 100644 --- a/ambari-web/app/routes/reassign_master_routes.js +++ b/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) { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9404fc00/ambari-web/app/templates/main/service/reassign/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/reassign/step1.hbs b/ambari-web/app/templates/main/service/reassign/step1.hbs index d7ca986..7481c1a 100644 --- a/ambari-web/app/templates/main/service/reassign/step1.hbs +++ b/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}} →</a> </div> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9404fc00/ambari-web/app/views/main/service/reassign/step1_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/reassign/step1_view.js b/ambari-web/app/views/main/service/reassign/step1_view.js index d0f82de..83668e5 100644 --- a/ambari-web/app/views/main/service/reassign/step1_view.js +++ b/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') });
