pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] revision fme@openerp.com-20110808171407-mfclmemaljegwsgg missed some references to openerp.base.Dialog.options which should have been renamed to dialog_options

Browse Source 
bzr revid: xmo@openerp.com-20110809074712-dyf3hkdrisj561x4
This commit is contained in:
Xavier Morel
2011-08-09 09:47:12 +02:00
parent 4c6e88ba46
commit f951ca003d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/static/src/js/chrome.js
+6 -6
View File
@@ -333,12 +333,12 @@ openerp.base.Dialog = openerp.base.OldWidget.extend({
},
set_options: function(options) {
options = options || {};
options.width = this.get_width(options.width || this.options.width);
options.min_width = this.get_width(options.min_width || this.options.min_width);
options.max_width = this.get_width(options.max_width || this.options.max_width);
options.height = this.get_height(options.height || this.options.height);
options.min_height = this.get_height(options.min_height || this.options.min_height);
options.max_height = this.get_height(options.max_height || this.options.max_width);
options.width = this.get_width(options.width || this.dialog_options.width);
options.min_width = this.get_width(options.min_width || this.dialog_options.min_width);
options.max_width = this.get_width(options.max_width || this.dialog_options.max_width);
options.height = this.get_height(options.height || this.dialog_options.height);
options.min_height = this.get_height(options.min_height || this.dialog_options.min_height);
options.max_height = this.get_height(options.max_height || this.dialog_options.max_width);
if (options.width !== 'auto') {
if (options.width > options.max_width) options.width = options.max_width;
addons/base/static/src/js/form.js
+1 -1
View File
@@ -1315,7 +1315,7 @@ openerp.base.form.dialog = function(content, options) {
}, options || {});
options.autoOpen = true;
var dialog = new openerp.base.Dialog(null, options);
dialog.$dialog = $(content).dialog(dialog.options);
dialog.$dialog = $(content).dialog(dialog.dialog_options);
return dialog.$dialog;
}