You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/10/08 17:39:56 UTC
git commit: AMBARI-7691 Cluster state is lost when session is expired
during cluster installation. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 54a3de777 -> 8ad5abd75
AMBARI-7691 Cluster state is lost when session is expired during cluster installation. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ad5abd7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ad5abd7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ad5abd7
Branch: refs/heads/trunk
Commit: 8ad5abd75c9f790df9df9f054fc32da6eafd4c43
Parents: 54a3de7
Author: atkach <at...@hortonworks.com>
Authored: Wed Oct 8 18:34:24 2014 +0300
Committer: atkach <at...@hortonworks.com>
Committed: Wed Oct 8 18:34:24 2014 +0300
----------------------------------------------------------------------
ambari-web/app/mappers/stack_mapper.js | 4 ++--
ambari-web/app/mixins/common/userPref.js | 4 +++-
ambari-web/test/mappers/stack_mapper_test.js | 4 ++++
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ad5abd7/ambari-web/app/mappers/stack_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/stack_mapper.js b/ambari-web/app/mappers/stack_mapper.js
index 8319f87..4bfea03 100644
--- a/ambari-web/app/mappers/stack_mapper.js
+++ b/ambari-web/app/mappers/stack_mapper.js
@@ -73,7 +73,7 @@ App.stackMapper = App.QuickDataMapper.create({
var resulOS = [];
var resultRepo = [];
- var stackVersions = json.items.filterProperty('Versions.active');
+ var stackVersions = json.items.filterProperty('Versions.active');
stackVersions.sortProperty('Versions.stack_version').reverse().forEach(function(item) {
var stack = item.Versions;
var operatingSystemsArray = [];
@@ -106,9 +106,9 @@ App.stackMapper = App.QuickDataMapper.create({
}, this);
+ App.store.commit();
App.store.loadMany(modelRepo, resultRepo);
App.store.loadMany(modelOS, resulOS);
App.store.loadMany(modelStack, resultStack);
-
}
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ad5abd7/ambari-web/app/mixins/common/userPref.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/userPref.js b/ambari-web/app/mixins/common/userPref.js
index 90a115d..78a2023 100644
--- a/ambari-web/app/mixins/common/userPref.js
+++ b/ambari-web/app/mixins/common/userPref.js
@@ -80,7 +80,9 @@ App.UserPref = Em.Mixin.create({
* @param {Object} value
*/
postUserPref: function (key, value) {
- if(!App.get('isAdmin')) return;
+ if (!App.get('isAdmin')) {
+ return $.Deferred().reject().promise();
+ };
var keyValuePair = {};
keyValuePair[key] = JSON.stringify(value);
return App.ajax.send({
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ad5abd7/ambari-web/test/mappers/stack_mapper_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mappers/stack_mapper_test.js b/ambari-web/test/mappers/stack_mapper_test.js
index 2f8b10d..0cc70ff 100644
--- a/ambari-web/test/mappers/stack_mapper_test.js
+++ b/ambari-web/test/mappers/stack_mapper_test.js
@@ -260,6 +260,10 @@ describe('App.stackMapper', function () {
App.resetDsStoreTypeMap(App.Repository);
App.resetDsStoreTypeMap(App.OperatingSystem);
App.resetDsStoreTypeMap(App.Stack);
+ sinon.stub(App.store, 'commit', Em.K);
+ });
+ afterEach(function(){
+ App.store.commit.restore();
});