Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-Preferences-imp-kjo into lp:openerp-web.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-Preferences-imp-kjo/+merge/112342
Two title bar is display in preferences popup due to inner dialog box. so we
fixed
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-Preferences-imp-kjo/+merge/112342
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-web/trunk-Preferences-imp-kjo into lp:openerp-web.
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-06-25 15:01:50 +0000
+++ addons/web/static/src/js/chrome.js 2012-06-27 12:24:47 +0000
@@ -781,10 +781,28 @@
var self = this;
var action_manager = new instance.web.ActionManager(this);
var dataset = new instance.web.DataSet (this,'res.users',this.context);
+ this.dialog = new instance.web.Dialog(this,{
+ width: '700px',
+ buttons: [
+ {text: _t("Change password"), click: function(){ self.change_password(); }},
+ {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
+ {text: _t("Save"), click: function(){
+ var dialog_viewmanager = action_manager.dialog_viewmanager;
+ dialog_viewmanager.views[dialog_viewmanager.active_view].controller.do_save()
+ .then(function() {
+ self.dialog.destroy();
+ // needs to refresh interface in case language changed
+ window.location.reload();
+ });
+ }
+ }
+ ]
+ });
+ action_manager.dialog = this.dialog;
dataset.call ('action_get','',function (result){
self.rpc('/web/action/load', {action_id:result}, function(result){
action_manager.do_action(_.extend(result['result'], {
- target: 'inline',
+ target: 'new',
res_id: self.session.uid,
res_model: 'res.users',
flags: {
@@ -797,26 +815,7 @@
}));
});
});
- this.dialog = new instance.web.Dialog(this,{
- title: _t("Preferences"),
- width: '700px',
- buttons: [
- {text: _t("Change password"), click: function(){ self.change_password(); }},
- {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
- {text: _t("Save"), click: function(){
- var inner_viewmanager = action_manager.inner_viewmanager;
- inner_viewmanager.views[inner_viewmanager.active_view].controller.do_save()
- .then(function() {
- self.dialog.destroy();
- // needs to refresh interface in case language changed
- window.location.reload();
- });
- }
- }
- ]
- }).open();
- action_manager.appendTo(this.dialog.$element);
- action_manager.renderElement(this.dialog);
+
},
on_menu_about: function() {
var self = this;
=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js 2012-06-25 13:52:15 +0000
+++ addons/web/static/src/js/views.js 2012-06-27 12:24:47 +0000
@@ -141,12 +141,14 @@
if(on_close)
this.dialog.on_close.add(on_close);
} else {
- this.dialog_viewmanager.destroy();
+ if (this.dialog_viewmanager)
+ this.dialog_viewmanager.destroy();
}
this.dialog.dialog_title = action.name;
this.dialog_viewmanager = new instance.web.ViewManagerAction(this, action);
this.dialog_viewmanager.appendTo(this.dialog.$element);
this.dialog.open();
+
} else {
this.dialog_stop();
this.content_stop();
_______________________________________________
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
