Vaibhav (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-diagram-popup-vda into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-diagram-popup-vda/+merge/87598
Used old form popup.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-diagram-popup-vda/+merge/87598
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-diagram-popup-vda.
=== modified file 'addons/web_diagram/__openerp__.py'
--- addons/web_diagram/__openerp__.py 2011-11-25 05:32:25 +0000
+++ addons/web_diagram/__openerp__.py 2012-01-05 11:24:34 +0000
@@ -3,7 +3,7 @@
"category" : "Hidden",
"description":'Openerp web Diagram view',
"version" : "2.0",
- "depends" : ["base"],
+ "depends" : ["web"],
"js": [
'static/lib/js/raphael-min.js',
'static/lib/js/dracula_graffle.js',
=== modified file 'addons/web_diagram/static/src/js/diagram.js'
--- addons/web_diagram/static/src/js/diagram.js 2012-01-03 16:06:50 +0000
+++ addons/web_diagram/static/src/js/diagram.js 2012-01-05 11:24:34 +0000
@@ -202,38 +202,40 @@
model = self.node;
if(id)
id = parseInt(id, 10);
- var action_manager = new openerp.web.ActionManager(this);
- var dialog = new openerp.web.Dialog(this, {
- width: 850,
- buttons : [
- {text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }},
- {text: _t("Save"), click: function() {
- var form_view = action_manager.inner_viewmanager.views.form.controller;
-
- form_view.do_save(function() {
- self.dataset.read_index(_.keys(self.fields_view.fields), self.on_diagram_loaded);
- });
- $(this).dialog('destroy');
- }
+
+ var pop,
+ title = model == self.node ? _t('Activity') : _t('Transition');
+ if(!id) {
+ pop = new openerp.web.form.SelectCreatePopup(this);
+ pop.select_element(
+ model,
+ {
+ title: _t("Create:") + title,
+ initial_view: 'form',
+ disable_multiple_selection: true
+ },
+ 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();
- action_manager.appendTo(dialog.$element);
- 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
- }
- });
+ );
+ pop.on_write.add(function() {
+ self.dataset.read_index(_.keys(self.fields_view.fields), self.on_diagram_loaded);
+ });
+ }
- var form_controller = action_manager.inner_viewmanager.views.form.controller;
+ var form_controller = pop.view_form;
var form_fields;
@@ -270,6 +272,8 @@
});
});
}
+
+
},
on_pager_action: function(action) {
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
