Repository: ambari Updated Branches: refs/heads/trunk 728c0daa6 -> 890996fa2
AMBARI-20234 : HiveView2.0 - settings not taking effect : added global settings to forcedContent before sending (nitirajrathore) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/890996fa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/890996fa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/890996fa Branch: refs/heads/trunk Commit: 890996fa23fc18524a122132f3f90326755acdb7 Parents: 728c0da Author: Nitiraj Singh Rathore <nitiraj.rath...@gmail.com> Authored: Wed Mar 1 14:48:29 2017 +0530 Committer: Nitiraj Singh Rathore <nitiraj.rath...@gmail.com> Committed: Wed Mar 1 14:49:06 2017 +0530 ---------------------------------------------------------------------- .../hive20/src/main/resources/ui/app/routes/queries/query.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/890996fa/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js index 4ac93db..62e5562 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js +++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js @@ -44,7 +44,7 @@ export default Ember.Route.extend(UILoggerMixin, { this.store.findAll('setting').then((data) => { let localStr = ''; data.forEach(x => { - localStr = localStr + 'set '+ x.get('key')+ '='+ x.get('value') + '\n'; + localStr = localStr + 'set '+ x.get('key')+ '='+ x.get('value') + ';\n'; }); this.set('globalSettings', localStr); }); @@ -296,12 +296,13 @@ export default Ember.Route.extend(UILoggerMixin, { let globalSettings = this.get('globalSettings'); + let forcedContent = globalSettings + queryInput; this.send('showQueryResultContainer'); let payload ={ "title":worksheetTitle, "dataBase":dbid, - "forcedContent":queryInput, + "forcedContent":forcedContent, "referrer":"job", "globalSettings":globalSettings};
