[IMP] better Workflow popup.
bzr revid: vda@tinyerp.com-20120105111652-az2x6pylbg9g5ext
This commit is contained in:
parent
05d0ef1c02
commit
37f76411bb
|
@ -3,7 +3,7 @@
|
||||||
"category" : "Hidden",
|
"category" : "Hidden",
|
||||||
"description":'Openerp web Diagram view',
|
"description":'Openerp web Diagram view',
|
||||||
"version" : "2.0",
|
"version" : "2.0",
|
||||||
"depends" : ["base"],
|
"depends" : ["web"],
|
||||||
"js": [
|
"js": [
|
||||||
'static/lib/js/raphael-min.js',
|
'static/lib/js/raphael-min.js',
|
||||||
'static/lib/js/dracula_graffle.js',
|
'static/lib/js/dracula_graffle.js',
|
||||||
|
|
|
@ -202,38 +202,40 @@ openerp.web.DiagramView = openerp.web.View.extend({
|
||||||
model = self.node;
|
model = self.node;
|
||||||
if(id)
|
if(id)
|
||||||
id = parseInt(id, 10);
|
id = parseInt(id, 10);
|
||||||
var action_manager = new openerp.web.ActionManager(this);
|
|
||||||
var dialog = new openerp.web.Dialog(this, {
|
var pop,
|
||||||
width: 850,
|
title = model == self.node ? _t('Activity') : _t('Transition');
|
||||||
buttons : [
|
if(!id) {
|
||||||
{text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }},
|
pop = new openerp.web.form.SelectCreatePopup(this);
|
||||||
{text: _t("Save"), click: function() {
|
pop.select_element(
|
||||||
var form_view = action_manager.inner_viewmanager.views.form.controller;
|
model,
|
||||||
|
{
|
||||||
form_view.do_save(function() {
|
title: _t("Create:") + title,
|
||||||
self.dataset.read_index(_.keys(self.fields_view.fields), self.on_diagram_loaded);
|
initial_view: 'form',
|
||||||
});
|
disable_multiple_selection: true
|
||||||
$(this).dialog('destroy');
|
},
|
||||||
}
|
this.dataset.domain,
|
||||||
|
this.context || this.dataset.context
|
||||||
|
);
|
||||||
|
pop.on_select_elements.add_last(function(element_ids) {
|
||||||
|
self.dataset.read_index(_.keys(self.fields_view.fields), self.on_diagram_loaded);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
pop = new openerp.web.form.FormOpenPopup(this);
|
||||||
|
pop.show_element(
|
||||||
|
model,
|
||||||
|
id,
|
||||||
|
this.context || this.dataset.context,
|
||||||
|
{
|
||||||
|
title: _t("Open: ") + title
|
||||||
}
|
}
|
||||||
]
|
);
|
||||||
}).start().open();
|
pop.on_write.add(function() {
|
||||||
action_manager.appendTo(dialog.$element);
|
self.dataset.read_index(_.keys(self.fields_view.fields), self.on_diagram_loaded);
|
||||||
action_manager.do_action({
|
});
|
||||||
res_model : model,
|
}
|
||||||
res_id: id,
|
|
||||||
views : [[false, 'form']],
|
|
||||||
type : 'ir.actions.act_window',
|
|
||||||
flags : {
|
|
||||||
search_view: false,
|
|
||||||
sidebar : false,
|
|
||||||
views_switcher : false,
|
|
||||||
action_buttons : false,
|
|
||||||
pager: false
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
var form_controller = action_manager.inner_viewmanager.views.form.controller;
|
var form_controller = pop.view_form;
|
||||||
|
|
||||||
var form_fields;
|
var form_fields;
|
||||||
|
|
||||||
|
@ -270,6 +272,8 @@ openerp.web.DiagramView = openerp.web.View.extend({
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
on_pager_action: function(action) {
|
on_pager_action: function(action) {
|
||||||
|
|
Loading…
Reference in New Issue