[FIX] resolve Conflicts reverts

bzr revid: jam@tinyerp.com-20120827050151-yinbjtladoe3vu5w

addons/web_diagram/static/src/js/diagram.js

@@ -47,7 +47,7 @@ instance.web.DiagramView = instance.web.View.extend({
             return label.tag == "label";
         });
 
-        this.$el.html(QWeb.render("DiagramView", this));
+        this.$el.html(QWeb.render("DiagramView", {'widget': this}));
         this.$el.addClass(this.fields_view.arch.attrs['class']);
 
         _.each(self.labels,function(label){

addons/web_diagram/static/src/xml/base_diagram.xml

@@ -2,7 +2,7 @@
 <t t-name="DiagramView">
     <div class="oe_diagram_header" t-att-id="element_id + '_header'">
         <h3 class="oe_diagram_title"/>
-            <t t-if="this._is_action_enabled('create')">
+            <t t-if="widget._is_action_enabled('create')">
                 <div class="oe_diagram_buttons">
                         <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button>
                 </div>