You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/04/08 19:30:51 UTC
ambari git commit: AMBARI-10406 Service checks and other actions
don't show up for services after some runs done. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk ced666f35 -> 728b2d470
AMBARI-10406 Service checks and other actions don't show up for services after some runs done. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/728b2d47
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/728b2d47
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/728b2d47
Branch: refs/heads/trunk
Commit: 728b2d47083d0a08453643bf7b166a289bba0df2
Parents: ced666f
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Apr 8 20:22:49 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Apr 8 20:22:49 2015 +0300
----------------------------------------------------------------------
ambari-web/app/views/main/service/item.js | 12 +++++++++++-
ambari-web/test/views/main/service/item_test.js | 9 +++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/728b2d47/ambari-web/app/views/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js
index 6fd6cec..db2b490 100644
--- a/ambari-web/app/views/main/service/item.js
+++ b/ambari-web/app/views/main/service/item.js
@@ -93,8 +93,13 @@ App.MainServiceItemView = Em.View.extend({
maintenance: [],
+ isMaintenanceSet: false,
+
observeMaintenance: function() {
- Em.run.once(this, 'observeMaintenanceOnce');
+ if (!this.get('isMaintenanceSet')) {
+ this.observeMaintenanceOnce();
+ }
+ Em.run.once(this, 'clearIsMaintenanceSet');
},
observeMaintenanceOnce: function() {
@@ -225,6 +230,11 @@ App.MainServiceItemView = Em.View.extend({
}
});
}
+ this.set('isMaintenanceSet', true);
+ },
+
+ clearIsMaintenanceSet: function () {
+ this.set('isMaintenanceSet', false);
},
isMaintenanceActive: function() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/728b2d47/ambari-web/test/views/main/service/item_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/service/item_test.js b/ambari-web/test/views/main/service/item_test.js
index 23e6e1c..62e4814 100644
--- a/ambari-web/test/views/main/service/item_test.js
+++ b/ambari-web/test/views/main/service/item_test.js
@@ -463,9 +463,18 @@ describe('App.MainServiceItemView', function () {
view.set('controller.content.passiveState', 'ON');
view.observeMaintenanceOnce();
expect(view.get('maintenance')).to.not.eql(oldMaintenance);
+ expect(view.get('isMaintenanceSet')).to.be.true;
});
});
});
+
+ describe('#clearIsMaintenanceSet', function () {
+ it('isMaintenanceSet should be false', function () {
+ view.set('isMaintenanceSet', true);
+ view.clearIsMaintenanceSet();
+ expect(view.get('isMaintenanceSet')).to.be.false;
+ });
+ });
});