You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2019/05/08 09:56:08 UTC
[ambari] branch branch-2.6 updated: AMBARI-25274. Discard and Save
buttons are always active in HIVE service configs
This is an automated email from the ASF dual-hosted git repository.
alexantonenko pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 30085e0 AMBARI-25274. Discard and Save buttons are always active in HIVE service configs
new d288543 Merge pull request #2969 from hiveww/AMBARI-25274-branch-2.6
30085e0 is described below
commit 30085e06d6f531e732adf7d3ae8fac521bfe9fbb
Author: Alex Antonenko <aa...@hortonworks.com>
AuthorDate: Tue May 7 17:13:37 2019 +0300
AMBARI-25274. Discard and Save buttons are always active in HIVE service configs
---
ambari-web/app/utils/config.js | 4 ++--
ambari-web/test/utils/config_test.js | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 0c3d280..5e02e25 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -329,7 +329,7 @@ App.config = Em.Object.create({
value: '',
savedValue: null,
isFinal: false,
- savedIsFinal: null,
+ savedIsFinal: false,
/** UI and Stack properties **/
recommendedValue: null,
recommendedIsFinal: null,
@@ -1195,7 +1195,7 @@ App.config = Em.Object.create({
var newOverride = App.ServiceConfigProperty.create(serviceConfigProperty);
- newOverride.setProperties({ 'savedValue': null, 'savedIsFinal': null });
+ newOverride.setProperties({ 'savedValue': null, 'savedIsFinal': false });
if (!Em.isNone(override)) {
for (var key in override) {
diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js
index 8b1dbeb..cdbd2cb 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -442,7 +442,7 @@ describe('App.config', function () {
savedValue: "sv1",
isFinal: true,
recommendedIsFinal: false,
- savedIsFinal: true
+ savedIsFinal: false
};
var configProperty = App.ServiceConfigProperty.create(template);
@@ -452,7 +452,7 @@ describe('App.config', function () {
Object.keys(template).forEach(function (key) {
it(key, function () {
var override = App.config.createOverride(configProperty, {}, group);
- if (['savedValue', 'savedIsFinal'].contains(key)) {
+ if (['savedValue'].contains(key)) {
expect(override.get(key)).to.equal(null);
} else {
expect(override.get(key)).to.equal(template[key]);
@@ -734,7 +734,7 @@ describe('App.config', function () {
value: '',
savedValue: null,
isFinal: false,
- savedIsFinal: null,
+ savedIsFinal: false,
/** UI and Stack properties **/
recommendedValue: null,
recommendedIsFinal: null,