You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by db...@apache.org on 2017/02/24 16:40:02 UTC
ambari git commit: AMBARI-20138. HiveView2.0: Settings page is case
sensitive. (dipayanb)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 c5c6d5962 -> 7702c4714
AMBARI-20138. HiveView2.0: Settings page is case sensitive. (dipayanb)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7702c471
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7702c471
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7702c471
Branch: refs/heads/branch-2.5
Commit: 7702c47141d95a43ec16d6f5e6ae4f22a05f0e50
Parents: c5c6d59
Author: Dipayan Bhowmick <di...@gmail.com>
Authored: Fri Feb 24 22:09:50 2017 +0530
Committer: Dipayan Bhowmick <di...@gmail.com>
Committed: Fri Feb 24 22:09:50 2017 +0530
----------------------------------------------------------------------
.../src/main/resources/ui/app/components/edit-setting-item.js | 2 +-
.../views/hive20/src/main/resources/ui/app/routes/settings.js | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7702c471/contrib/views/hive20/src/main/resources/ui/app/components/edit-setting-item.js
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/resources/ui/app/components/edit-setting-item.js b/contrib/views/hive20/src/main/resources/ui/app/components/edit-setting-item.js
index 4bc8787..161c17c 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/components/edit-setting-item.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/components/edit-setting-item.js
@@ -52,7 +52,7 @@ export default Ember.Component.extend({
return {valid: true};
}
- if (setting.get('values') && setting.get('values').mapBy('value').contains(value)) {
+ if (setting.get('values') && setting.get('values').mapBy('value').contains(value.toLowerCase())) {
return {valid: true};
} else if (setting.get('values')) {
error = `Value should be in (${setting.get('values').mapBy('value').join(', ')})`;
http://git-wip-us.apache.org/repos/asf/ambari/blob/7702c471/contrib/views/hive20/src/main/resources/ui/app/routes/settings.js
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/settings.js b/contrib/views/hive20/src/main/resources/ui/app/routes/settings.js
index affc126..f45881b 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/settings.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/settings.js
@@ -63,6 +63,11 @@ export default Ember.Route.extend(UILoggerMixin, {
return setting.destroyRecord().then(data => {
let model = this.get('controller.model');
model.removeObject(data);
+ let hiveParameters = this.controller.get('hiveParameters');
+ let existingHiveParams = hiveParameters.findBy('name', setting.get('key'));
+ if(existingHiveParams) {
+ existingHiveParams.set('disabled', false);
+ }
}, err => {
this.get('logger').danger(`Failed to delete setting with key: '${setting.get('key')}`, this.extractError(err));
})