From c3ade091e5f9457b926b25367a71ec0d2d415a6e Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Tue, 30 Aug 2011 14:06:22 +0530 Subject: [PATCH] [FIX] set Workflow id for new record. bzr revid: vda@tinyerp.com-20110830083622-ssr41k0t31hkzd3z --- addons/base_diagram/static/src/js/diagram.js | 44 ++++++++++++-------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/addons/base_diagram/static/src/js/diagram.js b/addons/base_diagram/static/src/js/diagram.js index 4b2089a0cd4..cadf93a5f69 100644 --- a/addons/base_diagram/static/src/js/diagram.js +++ b/addons/base_diagram/static/src/js/diagram.js @@ -181,9 +181,9 @@ openerp.base_diagram.DiagramView = openerp.base.View.extend({ var node = r.rect(n.node.x-30, n.node.y-13, 60, 44).attr({ "fill": n.node.color, r : "12px", - "stroke-width" : n.distance == 0 ? "3px" : "1px" + "stroke-width" : n.distance == 0 ? "3px" : "1px" }); - set = r.set().push(node).push(r.text(n.node.x , n.node.y+5 , (n.label || n.id))); + set = r.set().push(node).push(r.text(n.node.x , n.node.y+10 , (n.label || n.id))); } // circle @@ -288,24 +288,34 @@ openerp.base_diagram.DiagramView = openerp.base.View.extend({ search_view: false, sidebar : false, views_switcher : false, - action_buttons : false + action_buttons : false, + pager: false } }); - if(id) { - var readonly_fields; - if(model == self.node) { - readonly_fields = ['wkf_id']; - } else { - readonly_fields = ['act_from', 'act_to']; - } - var form_controller = action_manager.inner_viewmanager.views.form.controller; - $.each(readonly_fields, function(index, fld) { - form_controller.on_record_loaded.add_first(function() { - form_controller.fields[fld].readonly = true; - form_controller.fields[fld].$input.attr('disabled', true); - form_controller.fields[fld].$drop_down.unbind(); - form_controller.fields[fld].$menu_btn.unbind(); + var form_controller = action_manager.inner_viewmanager.views.form.controller; + + var form_fields; + + if(model == self.node) { + form_fields = ['wkf_id']; + } else { + form_fields = ['act_from', 'act_to']; + } + + $.each(form_fields, function(index, fld) { + form_controller.on_record_loaded.add_first(function() { + form_controller.fields[fld].modifiers.readonly = true; + form_controller.fields[fld].$input.attr('disabled', true); + form_controller.fields[fld].$drop_down.unbind(); + form_controller.fields[fld].$menu_btn.unbind(); + }); + }); + + if(!id && (model == self.node)) { + $.each(form_fields, function(index, fld) { + form_controller.on_record_loaded.add_last(function() { + form_controller.fields[fld].set_value([self.id,self.active_model]) }); }); }