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 2016/09/30 07:41:12 UTC
[1/2] ambari git commit: AMBARI-18494 Js error when changing config
group via dropdown. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 32ab17b33 -> 120505f9a
AMBARI-18494 Js error when changing config group via dropdown. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/120505f9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/120505f9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/120505f9
Branch: refs/heads/trunk
Commit: 120505f9a2b4da35604564f0ab066ad67fecd86a
Parents: 013b7bd
Author: ababiichuk <ab...@hortonworks.com>
Authored: Thu Sep 29 17:09:42 2016 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Fri Sep 30 10:33:49 2016 +0300
----------------------------------------------------------------------
.../app/mixins/common/configs/config_recommendation_parser.js | 2 +-
.../mixins/common/configs/config_recommendation_parser_test.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/120505f9/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index b88cf62..d07d108 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -82,7 +82,7 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
propertiesToDelete.push(config);
} else if (attr === 'visible' || stackProperty) {
/** update config boundaries **/
- updateBoundariesCallback(stackProperty, attr, propertyAttributes[attr], name, fileName, configGroup);
+ updateBoundariesCallback(stackProperty, attr, propertyAttributes[attr], configGroup);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/120505f9/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js b/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
index f08bbad..c7c24d4 100644
--- a/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
+++ b/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
@@ -102,12 +102,12 @@ describe('App.ConfigRecommendationParser', function() {
it('updateBoundariesCallback maximum', function() {
expect(instanceObject.updateBoundariesCallback.calledWith({ name: 'p3', filename: 'fileName1' },
- 'maximum', 100, 'p3', 'fileName1', null)).to.be.true;
+ 'maximum', 100, null)).to.be.true;
});
it('updateBoundariesCallback minimum', function() {
expect(instanceObject.updateBoundariesCallback.calledWith({ name: 'p3', filename: 'fileName1' },
- 'minimum', 1, 'p3', 'fileName1', null)).to.be.true;
+ 'minimum', 1, null)).to.be.true;
});
});
[2/2] ambari git commit: AMBARI-18493 Error on manage group popup.
(ababiichuk)
Posted by ab...@apache.org.
AMBARI-18493 Error on manage group popup. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/013b7bd0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/013b7bd0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/013b7bd0
Branch: refs/heads/trunk
Commit: 013b7bd08117abc082400279f7b24d33a9819e34
Parents: 32ab17b
Author: ababiichuk <ab...@hortonworks.com>
Authored: Thu Sep 29 15:40:22 2016 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Fri Sep 30 10:33:49 2016 +0300
----------------------------------------------------------------------
.../controllers/main/service/manage_config_groups_controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/013b7bd0/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index ad44b9c..539d03e 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -931,7 +931,7 @@ App.ManageConfigGroupsController = Em.Controller.extend(App.ConfigOverridable, {
var errors = [];
var self = this;
var finishFunction = function (xhr, text, errorThrown) {
- if (xhr && errorThrown) {
+ if (xhr && typeof (errorThrown) === 'string') {
var error = xhr.status + "(" + errorThrown + ") ";
try {
var json = $.parseJSON(xhr.responseText);