Harry (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-addons20-settings-rga 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-addons20-settings-rga/+merge/136137
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-addons20-settings-rga/+merge/136137
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-addons20-settings-rga.
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-11-26 10:05:01 +0000
+++ addons/web/static/src/js/chrome.js 2012-11-26 11:04:23 +0000
@@ -150,6 +150,17 @@
open: function() {
if (!this.dialog_inited) {
this.init_dialog();
+<<<<<<< TREE
+=======
+ var o = this.get_options(options);
+ this.add_buttons(o.buttons);
+ delete(o.buttons);
+ this.$buttons.appendTo($("body"));
+ instance.web.dialog(this.$el, o).dialog('open');
+ this.$buttons.appendTo(this.$el.dialog("widget"));
+ if (o.height === 'auto' && o.max_height) {
+ this.$el.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
+>>>>>>> MERGE-SOURCE
}
this.$el.dialog('open');
this.$el.dialog("widget").append(this.$buttons);
=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js 2012-11-22 09:43:47 +0000
+++ addons/web/static/src/js/views.js 2012-11-26 11:04:23 +0000
@@ -320,6 +320,7 @@
});
this.dialog.on("closing", null, options.on_close);
this.dialog.dialog_title = executor.action.name;
+ this.dialog.$buttons.empty()
if (widget instanceof instance.web.ViewManager) {
_.extend(widget.flags, {
$buttons: this.dialog.$buttons,
_______________________________________________
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
