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/06/23 19:00:36 UTC
[1/2] ambari git commit: AMBARI-12095 Configs: version box (and
hover) showing stack, then disappears. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 9454bfee5 -> 334b7c458
AMBARI-12095 Configs: version box (and hover) showing stack, then disappears. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5f9cf5a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5f9cf5a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5f9cf5a8
Branch: refs/heads/trunk
Commit: 5f9cf5a8737e8d6c1e9fb194782a44ad4c6803aa
Parents: 9454bfe
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Jun 22 19:47:23 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Jun 23 19:38:43 2015 +0300
----------------------------------------------------------------------
.../controllers/main/dashboard/config_history_controller.js | 2 +-
.../main/dashboard/config_history_controller_test.js | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5f9cf5a8/ambari-web/app/controllers/main/dashboard/config_history_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/dashboard/config_history_controller.js b/ambari-web/app/controllers/main/dashboard/config_history_controller.js
index 2d58d95..a2e6f52 100644
--- a/ambari-web/app/controllers/main/dashboard/config_history_controller.js
+++ b/ambari-web/app/controllers/main/dashboard/config_history_controller.js
@@ -32,7 +32,7 @@ App.MainConfigHistoryController = Em.ArrayController.extend(App.TableServerMixin
resetStartIndex: true,
mockUrl: '/data/configurations/service_versions.json',
realUrl: function () {
- return App.apiPrefix + '/clusters/' + App.get('clusterName') + '/configurations/service_config_versions?<parameters>fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true';
+ return App.apiPrefix + '/clusters/' + App.get('clusterName') + '/configurations/service_config_versions?<parameters>fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true';
}.property('App.clusterName'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/5f9cf5a8/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js b/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js
index 68e99c1..a1bc7af 100644
--- a/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js
+++ b/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js
@@ -28,11 +28,11 @@ describe('MainConfigHistoryController', function () {
describe('#realUrl', function () {
it('cluster name is empty', function () {
App.set('clusterName', '');
- expect(controller.get('realUrl')).to.equal('/api/v1/clusters//configurations/service_config_versions?<parameters>fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true');
+ expect(controller.get('realUrl')).to.equal('/api/v1/clusters//configurations/service_config_versions?<parameters>fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true');
});
it('cluster name is "mycluster"', function () {
App.set('clusterName', 'mycluster');
- expect(controller.get('realUrl')).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?<parameters>fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true');
+ expect(controller.get('realUrl')).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?<parameters>fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true');
});
});
describe('#load()', function () {
@@ -110,14 +110,14 @@ describe('MainConfigHistoryController', function () {
if ('testMode' === k) return false;
return Em.get(App, k);
});
- expect(controller.getUrl()).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true');
+ expect(controller.getUrl()).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true');
});
it('query params is correct', function () {
sinon.stub(App, 'get', function(k) {
if ('testMode' === k) return false;
return Em.get(App, k);
});
- expect(controller.getUrl({})).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?params&fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true');
+ expect(controller.getUrl({})).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?params&fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true');
});
});
[2/2] ambari git commit: AMBARI-12098 Undo does not revert final for
combo-box enhanced configs. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-12098 Undo does not revert final for combo-box enhanced configs. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/334b7c45
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/334b7c45
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/334b7c45
Branch: refs/heads/trunk
Commit: 334b7c458eb92e10491e1cb021d9a6faca2e4489
Parents: 5f9cf5a
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Jun 22 19:47:23 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Jun 23 19:56:27 2015 +0300
----------------------------------------------------------------------
.../views/common/configs/widgets/combo_config_widget_view.js | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/334b7c45/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
index d8ade1d..dea7ef8 100644
--- a/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
@@ -118,6 +118,9 @@ App.ComboConfigWidgetView = App.ConfigWidgetView.extend({
*/
restoreValue: function() {
this.setConfigValue({ context: this.get('config.savedValue') });
+ if (this.get('config.supportsFinal')) {
+ this.get('config').set('isFinal', this.get('config.savedIsFinal'));
+ }
},
/**
@@ -125,6 +128,9 @@ App.ComboConfigWidgetView = App.ConfigWidgetView.extend({
*/
setRecommendedValue: function () {
this.setConfigValue({ context: this.get('config.recommendedValue')});
+ if (this.get('config.supportsFinal')) {
+ this.get('config').set('isFinal', this.get('config.recommendedIsFinal'));
+ }
},
/**