ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [01/22] ambari git commit: AMBARI-20718.User should not be allowed to validate/Submit the workflow in case of duplicate action nodes(Venkata Sairam via padmapriyanitt)
Date Tue, 11 Apr 2017 11:14:23 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-3.0-perf 8de3961b6 -> 2f20b2ed2


AMBARI-20718.User should not be allowed to validate/Submit the workflow in case of duplicate
action nodes(Venkata Sairam via padmapriyanitt)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/73eff121
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73eff121
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73eff121

Branch: refs/heads/branch-3.0-perf
Commit: 73eff1215c6d99b618dfdd545a039aeab63135ff
Parents: 36e456b
Author: padmapriyanitt <padmapriyanitt@gmail.com>
Authored: Tue Apr 11 15:40:47 2017 +0530
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Apr 11 14:14:12 2017 +0300

----------------------------------------------------------------------
 .../src/main/resources/ui/app/components/flow-designer.js     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/73eff121/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index e3f3718..17f21ee 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -723,10 +723,9 @@ export default Ember.Component.extend(FindNodeMixin, Validations, {
   },
   openJobConfig () {
     this.get('workflowContext').clearErrors();
-    var workflowGenerator=WorkflowGenerator.create({workflow:this.get("workflow"),
-    workflowContext:this.get('workflowContext')});
-    var workflowXml=workflowGenerator.process();
-    if(this.get('workflowContext').hasErrors()){
+    var workflowGenerator = WorkflowGenerator.create({workflow:this.get("workflow"), workflowContext:this.get('workflowContext')});
+    var workflowXml = workflowGenerator.process();
+    if(this.get('workflowContext').hasErrors() || (this.get("validationErrors") &&
this.get("validationErrors").length)){
       this.set('errors',this.get('workflowContext').getErrors());
     }else{
       var dynamicProperties = this.get('propertyExtractor').getDynamicProperties(workflowXml);


Mime
View raw message