Repository: ambari Updated Branches: refs/heads/trunk b86507829 -> 931021f56
AMBARI-16443. [Hive View] - Save Default Settings should not permit empty parameter values (pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/931021f5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/931021f5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/931021f5 Branch: refs/heads/trunk Commit: 931021f5627de0f8e7eca85faafdfdb98326ad20 Parents: b865078 Author: Pallav Kulshreshtha <[email protected]> Authored: Thu May 12 13:18:00 2016 +0530 Committer: Pallav Kulshreshtha <[email protected]> Committed: Thu May 12 13:18:00 2016 +0530 ---------------------------------------------------------------------- .../ui/hive-web/app/services/settings.js | 44 ++++++++++++++------ 1 file changed, 32 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/931021f5/contrib/views/hive/src/main/resources/ui/hive-web/app/services/settings.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/services/settings.js b/contrib/views/hive/src/main/resources/ui/hive-web/app/services/settings.js index b813bbf..df135d3 100644 --- a/contrib/views/hive/src/main/resources/ui/hive-web/app/services/settings.js +++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/services/settings.js @@ -124,20 +124,40 @@ export default Ember.Service.extend({ var url = adapter.buildURL() + '/savedQueries/defaultSettings'; var settings = this.get('settings'); - settings.forEach(function(setting) { - data[ setting.get('key.name') ] = setting.get('value'); - }); + var settingException = {}; + + try { + settings.forEach(function(setting) { + + settingException['value'] = Ember.isEmpty(setting.get('value')); + + if(settingException['value']) { + settingException['name'] = setting.get('key.name'); + throw settingException + } + data[setting.get('key.name')] = setting.get('value'); + + }); + } catch(e) { + if (e!==settingException) throw e; + } + + + if(settingException['value']){ + self.get('notifyService').error('Please enter the value for '+ settingException['name'] ); + return; + } adapter.ajax(url, 'POST', { - data: {settings: data } - }) - .then(function(response) { - if (response && response.settings) { - self.get('notifyService').success(Ember.I18n.t('alerts.success.settings.saved')); - } else { - self.get('notifyService').error(response); - } - }); + data: {settings: data } + }) + .then(function(response) { + if (response && response.settings) { + self.get('notifyService').success(Ember.I18n.t('alerts.success.settings.saved')); + } else { + self.get('notifyService').error(response); + } + }); }, getSettings: function() {
