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/09/03 12:12:21 UTC
ambari git commit: AMBARI-12990. User may click Next while Rerun
Checks is executing (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 e54a453cd -> fd324ac14
AMBARI-12990. User may click Next while Rerun Checks is executing (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd324ac1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd324ac1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd324ac1
Branch: refs/heads/branch-2.1
Commit: fd324ac140627795e57ad79491c9e8d459698a01
Parents: e54a453
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Thu Sep 3 13:01:56 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Thu Sep 3 13:01:56 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step3_controller.js | 3 +++
.../manage_alert_groups/select_definitions_popup_body_view.js | 5 +++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd324ac1/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index ee6563f..2017071 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -1703,6 +1703,8 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, {
primary: Em.I18n.t('common.close'),
+ autoHeight: false,
+
onPrimary: function () {
self.set('checksUpdateStatus', null);
this.hide();
@@ -1718,6 +1720,7 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, {
},
didInsertElement: function () {
+ this._super();
this.fitHeight();
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd324ac1/ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js b/ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js
index b92ddad..e7a23a3 100644
--- a/ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js
+++ b/ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js
@@ -55,6 +55,11 @@ App.SelectDefinitionsPopupBodyView = App.TableView.extend({
this.filteredContentObsOnce();
},
+ /**
+ * Default filter isn't needed
+ */
+ filter: Em.K,
+
filterDefs: function () {
var showOnlySelectedDefs = this.get('showOnlySelectedDefs');
var filterComponent = this.get('filterComponent');