From 24895d97a084f2ae6ca189f7804f2b4d3b8b7dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 5 Dec 2014 16:35:50 +0900
Subject: [PATCH] cleanups

---
 .../BusinessProcess_getGraph.xml                |  1 -
 .../erp5_graph_editor/jsplumb/jsplumb.js.xml    |  2 +-
 .../scripts/afterEdit.xml                       | 17 +++++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

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 8c9bcc2727..1c6df592e1 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
@@ -54,7 +54,6 @@
 import json\n
 portal = context.getPortalObject()\n
 \n
-#context.manage_delProperties([\'jsplumb_graph\'])\n
 # if a graph has been saved, we use this info for node coordinates.\n
 position_graph = context.getProperty(\'jsplumb_graph\')\n
 if position_graph:\n
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 763c2f00dc..7a33813cc1 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
@@ -24,7 +24,7 @@
 
 /* ===========================================================================\n
  * Copyright 2013 Nexedi SA and Contributors\n
- * \n
+ *\n
  * This file is part of DREAM.\n
  *\n
  * DREAM is free software: you can redistribute it and/or modify\n
diff --git a/bt5/erp5_graph_editor/WorkflowTemplateItem/portal_workflow/business_process_graph_editor_interaction_workflow/scripts/afterEdit.xml b/bt5/erp5_graph_editor/WorkflowTemplateItem/portal_workflow/business_process_graph_editor_interaction_workflow/scripts/afterEdit.xml
index 924c392507..c5cc8101f7 100644
--- a/bt5/erp5_graph_editor/WorkflowTemplateItem/portal_workflow/business_process_graph_editor_interaction_workflow/scripts/afterEdit.xml
+++ b/bt5/erp5_graph_editor/WorkflowTemplateItem/portal_workflow/business_process_graph_editor_interaction_workflow/scripts/afterEdit.xml
@@ -54,19 +54,18 @@
 business_process = sci[\'object\']\n
 graph = business_process.getProperty(\'jsplumb_graph\')\n
 \n
-trade_state_dict = dict(start=None, end=None)\n
-for trade_state in business_process.getPortalObject().portal_categories.trade_state.getCategoryChildValueList():\n
-  # XXX I hope no duplicates\n
-  trade_state_dict[trade_state.getReference() or trade_state.getId()] = trade_state\n
-\n
-from pprint import pformat\n
 \n
 if graph:\n
+  trade_state_dict = dict(start=None, end=None)\n
+  for trade_state in business_process.getPortalObject().portal_categories.trade_state.getCategoryChildValueList():\n
+    # XXX I hope no duplicates\n
+    trade_state_dict[trade_state.getReference() or trade_state.getId()] = trade_state\n
+\n
   graph = json.loads(graph)[\'graph\']\n
 \n
-  for edge_id, edge_data in graph[\'edge\'].items():\n
+  for edge_data in graph[\'edge\'].values():\n
     # Create the business link if it does not exist yet.\n
-    if not edge_data.get(\'business_process_relative_url\'):\n
+    if not edge_data.get(\'business_link_url\'):\n
       business_process.newContent(\n
         portal_type=\'Business Link\',\n
         predecessor_value=trade_state_dict[edge_data[\'source\']],\n
@@ -74,8 +73,6 @@ if graph:\n
         title=edge_data.get(\'name\'),\n
         trade_phase=edge_data.get(\'trade_phase\'),\n
       )\n
-      \n
-if not graph: bam\n
 </string> </value>
         </item>
         <item>
-- 
2.30.9