Repository: ambari Updated Branches: refs/heads/trunk ba470c186 -> 5186db066
AMBARI-20093. Cannot edit join node name in Workflow Manager.(Belliraj HB via gauravn7) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5186db06 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5186db06 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5186db06 Branch: refs/heads/trunk Commit: 5186db06659916148229fbd02aa742b7caeaa2f9 Parents: ba470c1 Author: Gaurav Nagar <grv...@gmail.com> Authored: Thu Feb 23 11:18:44 2017 +0530 Committer: Gaurav Nagar <grv...@gmail.com> Committed: Thu Feb 23 11:19:36 2017 +0530 ---------------------------------------------------------------------- .../main/resources/ui/app/domain/cytoscape-flow-renderer.js | 2 +- .../src/main/resources/ui/app/domain/cytoscape-style.js | 8 ++++++++ .../resources/ui/app/templates/components/flow-designer.hbs | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5186db06/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js index 51e0461..75ceecb 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js @@ -19,7 +19,7 @@ import Ember from 'ember'; import CytoscapeStyles from '../domain/cytoscape-style'; var CytoscapeRenderer= Ember.Object.extend({ currentCyNode: null, - staticNodes: ['start', 'end', 'join', 'placeholder'], + staticNodes: ['start', 'end', 'placeholder'], dataNodes: [], cyOverflow: {}, cy: null, http://git-wip-us.apache.org/repos/asf/ambari/blob/5186db06/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js index 2eb01d1..e05b782 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js @@ -18,6 +18,7 @@ import Ember from 'ember'; var defaultNodeColor = '#fff'; var actionNodeColor = '#f5f5f5'; +var killNodeColor='#d43f3a' var labelFunction=function(target) { if (!target.data().node.name) { return ""; @@ -114,6 +115,13 @@ export default Ember.Object.create({ return "none"; } }, + 'color': function(target){ + if (!target.data().transition || !target.data().transition.isOnError()) { + return "black" + }else{ + return killNodeColor; + } + }, width: 1, 'font-size': 12, label: function(target) { http://git-wip-us.apache.org/repos/asf/ambari/blob/5186db06/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs index 0356e9c..1a73421 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs @@ -197,7 +197,7 @@ <div id="cyRenderer"> <div id="{{cyId}}" class="cy-panel"></div> {{#each dataNodes as |dataNode|}} - {{#if (or (eq dataNode.data.type 'action') (eq dataNode.data.type 'decision') (eq dataNode.data.type 'fork'))}} + {{#if (or (eq dataNode.data.type 'action') (eq dataNode.data.type 'decision') (eq dataNode.data.type 'fork') (eq dataNode.data.type 'join'))}} <div id="{{dataNode.data.id}}" class=""> {{input required pattern="([a-zA-Z_]([\-_a-zA-Z0-9])*){1,39}" name="actionName" data-toggle="tooltip" title=dataNode.name classBinding="dataNode.data.node.errors:error:editable" class="editableNode overlay_node_editor" value=dataNode.dataNodeName placeholder="Action Name"}} </div>