From 5d754afde4ac383c31f072134eac145673d8b910 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 26 Oct 2011 15:49:29 +0200
Subject: [PATCH] [ADD] Creation of new edges via clicketyclick

bzr revid: xmo@openerp.com-20111026134929-ze1jl0efq7o07lr5
---
 addons/web_diagram/static/src/js/diagram.js   | 38 +++++++++++++++++--
 .../static/src/xml/base_diagram.xml           |  1 -
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 4867d778b13..77c5a8512bb 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -54,7 +54,6 @@ openerp.web.DiagramView = openerp.web.View.extend({
 
         // New Node,Edge
         this.$element.find('#new_node.oe_diagram_button_new').click(function(){self.add_edit_node(null, self.node);});
-        this.$element.find('#new_edge.oe_diagram_button_new').click(function(){self.add_edit_node(null, self.connector);});
 
         if(this.id) {
             self.get_diagram_info();
@@ -109,7 +108,23 @@ openerp.web.DiagramView = openerp.web.View.extend({
             this.get_diagram_info();
         }
     },
-
+    select_node: function (node, element) {
+        if (!this.selected_node) {
+            this.selected_node = node;
+            element.attr('stroke', 'red');
+            return;
+        }
+        // Re-click selected node, deselect it
+        if (node.id === this.selected_node.id) {
+            this.selected_node = null;
+            element.attr('stroke', 'black');
+            return;
+        }
+        this.add_edit_node(null, this.connector, {
+            act_from: this.selected_node.id,
+            act_to: node.id
+        });
+    },
     draw_diagram: function(result) {
         var diagram = new Graph();
 
@@ -131,6 +146,13 @@ openerp.web.DiagramView = openerp.web.View.extend({
                 .attr("cursor", "pointer")
                 .dblclick(function() {
                     self.add_edit_node(n.node.id, self.node);
+                })
+                .mousedown(function () { node.moved = false; })
+                .mousemove(function () { node.moved = true; })
+                .click(function () {
+                    // Ignore click from move event
+                    if (node.moved) { return; }
+                    self.select_node(n.node, node);
                 });
 
             if (shape === 'rect') {
@@ -169,7 +191,8 @@ openerp.web.DiagramView = openerp.web.View.extend({
         });
     },
 
-    add_edit_node: function(id, model) {
+    add_edit_node: function(id, model, defaults) {
+        defaults = defaults || {};
         var self = this;
 
         if(!model)
@@ -238,6 +261,15 @@ openerp.web.DiagramView = openerp.web.View.extend({
                 });
             });
         }
+        if (!_.isEmpty(defaults)) {
+            form_controller.on_record_loaded.add_last(function () {
+                _(form_fields).each(function (field) {
+                    if (!defaults[field]) { return; }
+                    form_controller.fields[field].set_value(defaults[field]);
+                    form_controller.fields[field].dirty = true;
+                });
+            });
+        }
     },
 
     on_pager_action: function(action) {
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index de34aefe739..20613c7b079 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -3,7 +3,6 @@
         <div class="oe_diagram_header" t-att-id="element_id + '_header'">
             <div class="oe_diagram_buttons">
                 <button type="button" id="new_node" class="oe_diagram_button_new">New Node</button>
-                <button type="button" id="new_edge" class="oe_diagram_button_new">New Edge</button>
             </div>
             <div class="oe_diagram_pager">
                 <button type="button" data-pager-action="first">First</button>