You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2015/08/11 11:05:25 UTC
ambari git commit: AMBARI-12713. Empty Alert groups dropdown after
page refresh (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1.1 1cb79255e -> bd6e95ffd
AMBARI-12713. Empty Alert groups dropdown after page refresh (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd6e95ff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd6e95ff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd6e95ff
Branch: refs/heads/branch-2.1.1
Commit: bd6e95ffdd51b941b9add382ca29fa6bbb6a5a10
Parents: 1cb7925
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Tue Aug 11 12:03:03 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Tue Aug 11 12:03:03 2015 +0300
----------------------------------------------------------------------
ambari-web/app/templates/main/alerts.hbs | 2 ++
ambari-web/package.json | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd6e95ff/ambari-web/app/templates/main/alerts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts.hbs b/ambari-web/app/templates/main/alerts.hbs
index 2547ad9..33bc908 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -23,7 +23,9 @@
{{/isAccessible}}
<div id="alert-groups-filter" class="pull-left advanced-header-table groups-filter">
+{{#if App.router.clusterController.isAlertsLoaded}}
{{view view.alertGroupFilterView}}
+{{/if}}
</div>
<div id="alerts">
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd6e95ff/ambari-web/package.json
----------------------------------------------------------------------
diff --git a/ambari-web/package.json b/ambari-web/package.json
index d18b162..6a3aa7e 100644
--- a/ambari-web/package.json
+++ b/ambari-web/package.json
@@ -1,7 +1,7 @@
{
"name": "Ambari",
"description": "Front-end package for the Apache Ambari Project",
- "version": "2.1.0",
+ "version": "2.1.2",
"homepage": "http://ambari.apache.org/",
"repository": {
"type": "git",