diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_getGraph.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_getGraph.xml index 9745efde80976e72e74eae93517866af6887b385..9832bae54fd26d5b5feb58745f3f0dac24e0d8db 100644 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_getGraph.xml +++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_getGraph.xml @@ -58,9 +58,7 @@ position_graph = context.getProperty(\'jsplumb_graph\')\n \n if position_graph:\n context.log(position_graph)\n - \n - position_graph = json.loads(position_graph)\n - \n + position_graph = json.loads(position_graph)[\'graph\']\n \n visited_business_process_set = set() # prevent infinite recurisions\n \n @@ -72,9 +70,12 @@ def getBusinessProcessGraph(business_process):\n for link in business_process.contentValues(portal_type=\'Business Link\'):\n for trade_state in (link.getPredecessorValue(), link.getSuccessorValue()):\n if trade_state is not None:\n - graph[\'node\'][trade_state.getReference() or trade_state.getId()] = dict(\n + state_id = trade_state.getReference() or trade_state.getId()\n + graph[\'node\'][state_id] = dict(\n _class=\'erp5.business_process.trade_state\',\n name=trade_state.getTranslatedTitle())\n + if state_id in position_graph[\'node\']:\n + graph[\'node\'][state_id][\'coordinate\'] = position_graph[\'node\'][state_id][\'coordinate\'] \n if link.getPredecessor() and link.getSuccessor(): # XXX no start ??\n graph[\'edge\'][link.getRelativeUrl()] = dict(\n _class=\'erp5.business_process.business_link\',\n diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_view.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_view.xml index 04a6d99bd4731360e2e2adcb76f756fc44220c4b..3db97cd9d437166ee47b19b93db5344087015d21 100644 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_view.xml +++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_view.xml @@ -53,7 +53,7 @@ </item> <item> <key> <string>enctype</string> </key> - <value> <string>application/x-www-form-urlencoded</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>group_list</string> </key> diff --git a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/jsplumb/jsplumb.js.xml b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/jsplumb/jsplumb.js.xml index 59ead5400a8a951e7c784af163f910b1e58c1c1e..49bcc13f1f41978c5a1a579dc1243d4cb8fb44e8 100644 --- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/jsplumb/jsplumb.js.xml +++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/jsplumb/jsplumb.js.xml @@ -8,7 +8,7 @@ <dictionary> <item> <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts17687421.03</string> </value> + <value> <string>ts17691107.44</string> </value> </item> <item> <key> <string>__name__</string> </key> @@ -526,7 +526,6 @@ }).declareAcquiredMethod("notifyDataChanged", "notifyDataChanged").declareMethod("render", function(data) {\n var gadget = this;\n this.props.data = {};\n - console.log("render", data);\n if (data.value) {\n // Gadget embedded in ERP5\n this.props.erp5_key = data.key;\n @@ -545,9 +544,11 @@ }\n this.props.jsplumb_instance = jsPlumb.getInstance();\n }).declareMethod("getContent", function() {\n + var ret = {};\n if (this.props.erp5_key) {\n // ERP5\n - return JSON.stringify({key: this.props.erp5_key, value: this.props.data});\n + ret[this.props.erp5_key] = JSON.stringify(this.props.data);\n + return ret;\n }\n return JSON.stringify(this.props.data);\n }).declareMethod("startService", function() {\n @@ -598,7 +599,7 @@ </item> <item> <key> <string>size</string> </key> - <value> <int>25449</int> </value> + <value> <int>25441</int> </value> </item> <item> <key> <string>title</string> </key>