Repository: ambari Updated Branches: refs/heads/branch-2.5 a647bf515 -> 454db4691
AMBARI-20003. Not able to preview the workflow xml.(Padma Priya N via gauravn7) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/454db469 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/454db469 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/454db469 Branch: refs/heads/branch-2.5 Commit: 454db4691a1c6d30d14330c599e3ac51286263a0 Parents: a647bf5 Author: Gaurav Nagar <grv...@gmail.com> Authored: Wed Feb 15 17:05:21 2017 +0530 Committer: Gaurav Nagar <grv...@gmail.com> Committed: Wed Feb 15 17:05:21 2017 +0530 ---------------------------------------------------------------------- .../src/main/resources/ui/app/components/sqoop-action.js | 8 ++++---- .../src/main/resources/ui/app/domain/actionjob_hanlder.js | 4 ++-- .../resources/ui/app/templates/components/sqoop-action.hbs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/454db469/contrib/views/wfmanager/src/main/resources/ui/app/components/sqoop-action.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/sqoop-action.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/sqoop-action.js index 13eb6e5..2756700 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/sqoop-action.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/sqoop-action.js @@ -22,7 +22,7 @@ export default Ember.Component.extend({ if(this.get('isArg')){ this.set("actionModel.command", undefined); }else{ - this.set("actionModel.args", Ember.A([])); + this.set("actionModel.arg", Ember.A([])); } }), initialize : function(){ @@ -33,10 +33,10 @@ export default Ember.Component.extend({ if(this.get('actionModel.jobXml') === undefined){ this.set("actionModel.jobXml", Ember.A([])); } - if(this.get('actionModel.args') === undefined && !this.get('actionModel.command')){ - this.set("actionModel.args", Ember.A([])); + if(this.get('actionModel.arg') === undefined && !this.get('actionModel.command')){ + this.set("actionModel.arg", Ember.A([])); this.set('isArg', false); - }else if(this.get('actionModel.args') && this.get('actionModel.args').length > 0){ + }else if(this.get('actionModel.arg') && this.get('actionModel.arg').length > 0){ this.set('isArg', true); }else{ this.set('isArg', false); http://git-wip-us.apache.org/repos/asf/ambari/blob/454db469/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js index 2a82c24..691cc26 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js @@ -185,13 +185,13 @@ var SqoopActionJobHandler=ActionJobHandler.extend({ {xml:"job-xml",domain:"jobXml",occurs:"many",domainProperty:"value"}, {xml:"configuration",customHandler:this.configurationMapper}, {xml:"command",domain:"command"}, - {xml:"argument",domain:"args",occurs:"many",domainProperty:"value"}, + {xml:"arg",domain:"arg",occurs:"many",domainProperty:"value"}, {xml:"file",domain:"files",occurs:"many",domainProperty:"value"}, {xml:"archive",domain:"archives",occurs:"many",domainProperty:"value"} ]; }, validate(nodeDomain){ - if (Ember.isBlank(nodeDomain.command) && nodeDomain.args.length<1){ + if (Ember.isBlank(nodeDomain.command) && nodeDomain.arg.length < 1){ return [{message : "Either command or arguments have to be set."}]; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/454db469/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs index fb59149..db69864 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs @@ -27,7 +27,7 @@ </div> </div> {{#if isArg}} - {{#arg-config args=actionModel.args register="register" title="arg"}}{{/arg-config}} + {{#arg-config args=actionModel.arg register="register" title="arg"}}{{/arg-config}} {{else}} <div class="form-group padding10"> <label for="inputEmail" class="control-label col-xs-2">Command</label>
