You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2013/11/06 14:41:38 UTC
git commit: AMBARI-3702. Open background ops dialog. click on a op.
Even when hosts are listed, the line "No hosts to show" is shown. (akovalenko)
Updated Branches:
refs/heads/trunk 9eb83fd99 -> a13cb6247
AMBARI-3702. Open background ops dialog. click on a op. Even when hosts are listed, the line "No hosts to show" is shown. (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/a13cb624
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/a13cb624
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/a13cb624
Branch: refs/heads/trunk
Commit: a13cb6247b66e08b553e0ac323703860873ec8a4
Parents: 9eb83fd
Author: Aleksandr Kovalenko <ol...@ukr.net>
Authored: Wed Nov 6 15:40:14 2013 +0200
Committer: Aleksandr Kovalenko <ol...@ukr.net>
Committed: Wed Nov 6 15:40:14 2013 +0200
----------------------------------------------------------------------
.../global/background_operations_controller.js | 2 +-
.../templates/common/host_progress_popup.hbs | 97 ++++++++++----------
2 files changed, 51 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a13cb624/ambari-web/app/controllers/global/background_operations_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/background_operations_controller.js b/ambari-web/app/controllers/global/background_operations_controller.js
index 3ad6a25..aad4dbe 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -225,7 +225,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
showPopup: function(){
App.updater.immediateRun('requestMostRecent');
- if(this.get('popupView') && App.HostPopup.get('isBackgroundOperations') && App.HostPopup.get('showServices')){
+ if(this.get('popupView') && App.HostPopup.get('isBackgroundOperations')){
this.set ('popupView.isNotShowBgChecked', !App.router.get('mainAdminUserSettingsController').loadShowBgChecked());
this.set('popupView.isOpen', true);
$(this.get('popupView.element')).appendTo('#wrapper');
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a13cb624/ambari-web/app/templates/common/host_progress_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs
index f450b8d..9cd788f 100644
--- a/ambari-web/app/templates/common/host_progress_popup.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup.hbs
@@ -35,27 +35,28 @@
</div>
</div>
<div id="service-info">
- {{#each servicesInfo in view.services}}
- <div {{bindAttr class="servicesInfo.isVisible::hidden :log-list-wrap"}}>
- <div {{action gotoHosts servicesInfo}} class="task-list-line-cursor">
- <div class="host-name-icon-wrap">
- <i {{bindAttr class="servicesInfo.status servicesInfo.icon"}}></i>
- <a href="#">
- {{servicesInfo.name}}
- </a>
- </div>
- <div class="progress-bar span2">
- <div {{bindAttr class="servicesInfo.isInProgress:progress-striped :active servicesInfo.barColor :progress"}}>
+ {{#if view.isServiceEmptyList}}
+ <div class="log-list-wrap">{{t hostPopup.noServicesToShow}}</div>
+ {{else}}
+ {{#each servicesInfo in view.services}}
+ <div {{bindAttr class="servicesInfo.isVisible::hidden :log-list-wrap"}}>
+ <div {{action gotoHosts servicesInfo}} class="task-list-line-cursor">
+ <div class="host-name-icon-wrap">
+ <i {{bindAttr class="servicesInfo.status servicesInfo.icon"}}></i>
+ <a href="#">
+ {{servicesInfo.name}}
+ </a>
+ </div>
+ <div class="progress-bar span2">
+ <div {{bindAttr class="servicesInfo.isInProgress:progress-striped :active servicesInfo.barColor :progress"}}>
<div class="bar" {{bindAttr style="servicesInfo.barWidth"}}></div>
+ </div>
</div>
+ <div class="host-progress-num">{{servicesInfo.progress}}%</div>
+ <div class="show-details"><i class="icon-caret-right"></i></div>
+ </div>
</div>
- <div class="host-progress-num">{{servicesInfo.progress}}%</div>
- <div class="show-details"><i class="icon-caret-right"></i></div>
- </div>
- </div>
- {{/each}}
- {{#if view.isServiceEmptyList}}
- <div class="log-list-wrap">{{t hostPopup.noServicesToShow}}</div>
+ {{/each}}
{{/if}}
</div>
</div>
@@ -82,27 +83,28 @@
</div>
</div>
<div id="host-info">
- {{#each hostInfo in view.hosts}}
- <div {{bindAttr class="hostInfo.isVisible::hidden :log-list-wrap"}}>
- <div {{action gotoTasks hostInfo}} class="task-list-line-cursor">
- <div class="host-name-icon-wrap">
- <i {{bindAttr class="hostInfo.status hostInfo.icon"}}></i>
- <a href="#">
- {{hostInfo.name}}
- </a>
- </div>
- <div class="progress-bar span2">
- <div {{bindAttr class="hostInfo.isInProgress:progress-striped :active hostInfo.barColor :progress"}}>
+ {{#if view.isHostEmptyList}}
+ <div class="log-list-wrap">{{t hostPopup.noHostsToShow}}</div>
+ {{else}}
+ {{#each hostInfo in view.hosts}}
+ <div {{bindAttr class="hostInfo.isVisible::hidden :log-list-wrap"}}>
+ <div {{action gotoTasks hostInfo}} class="task-list-line-cursor">
+ <div class="host-name-icon-wrap">
+ <i {{bindAttr class="hostInfo.status hostInfo.icon"}}></i>
+ <a href="#">
+ {{hostInfo.name}}
+ </a>
+ </div>
+ <div class="progress-bar span2">
+ <div {{bindAttr class="hostInfo.isInProgress:progress-striped :active hostInfo.barColor :progress"}}>
<div class="bar" {{bindAttr style="hostInfo.barWidth"}}></div>
+ </div>
</div>
+ <div class="host-progress-num">{{hostInfo.progress}}%</div>
+ <div class="show-details"><i class="icon-caret-right"></i></div>
+ </div>
</div>
- <div class="host-progress-num">{{hostInfo.progress}}%</div>
- <div class="show-details"><i class="icon-caret-right"></i></div>
- </div>
- </div>
- {{/each}}
- {{#if view.isHostEmptyList}}
- <div class="log-list-wrap">{{t hostPopup.noHostsToShow}}</div>
+ {{/each}}
{{/if}}
</div>
</div>
@@ -127,19 +129,20 @@
</div>
</div>
<div id="host-log">
- {{#each taskInfo in view.tasks}}
- <div {{bindAttr class="taskInfo.isVisible::hidden :log-list-wrap"}}>
- <div {{action toggleTaskLog taskInfo}} class="task-list-line-cursor">
- <i {{bindAttr class="taskInfo.status taskInfo.icon"}}></i>
- <a href="#">
- {{{taskInfo.role}} {{taskInfo.command}}
- </a>
- <div class="show-details"><i class="icon-caret-right"></i></div>
- </div>
- </div>
- {{/each}}
{{#if view.isTasksEmptyList}}
<div class="log-list-wrap">{{t hostPopup.noTasksToShow}}</div>
+ {{else}}
+ {{#each taskInfo in view.tasks}}
+ <div {{bindAttr class="taskInfo.isVisible::hidden :log-list-wrap"}}>
+ <div {{action toggleTaskLog taskInfo}} class="task-list-line-cursor">
+ <i {{bindAttr class="taskInfo.status taskInfo.icon"}}></i>
+ <a href="#">
+ {{{taskInfo.role}} {{taskInfo.command}}
+ </a>
+ <div class="show-details"><i class="icon-caret-right"></i></div>
+ </div>
+ </div>
+ {{/each}}
{{/if}}
</div>
</div>