Sananaz (Open ERP) has proposed merging
lp:~openerp-dev/openobject-client-web/6.0-opw-6181-sma into
lp:openobject-client-web/6.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-6181-sma/+merge/66243
Hello,
Steps to generate problem.
- Go to Leads
- Open any cancel or closed leads
- Click on `Convert to an opportunity` Button
Problems are:
1> Display an error in a wizard (@ top left)
2> When pressing "ok" button, return to the list of object (listview) instead
of the object we come from
Expected:
1> Display error (@center)
2> After pressing "ok" button we return to the previous view
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-6181-sma/+merge/66243
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-client-web/6.0-opw-6181-sma.
=== modified file 'addons/openerp/controllers/templates/error_page.mako'
--- addons/openerp/controllers/templates/error_page.mako 2011-01-18 13:35:04 +0000
+++ addons/openerp/controllers/templates/error_page.mako 2011-06-29 06:51:08 +0000
@@ -50,13 +50,31 @@
jQuery.fancybox.close();
return;
}
+
+ var topWindow;
+ if(window.top != window) {
+ topWindow = window.top;
+ } else {
+ topWindow = window.opener;
+ }
+ var $doc = jQuery(topWindow.document);
+ var terp_id = jQuery(idSelector('_terp_id'), $doc).val();
+
+ var frame_element;
+ if(jQuery(window).attr('frameElement')) {
+ frame_element = window.frameElement;
+ } else {
+ frame_element = jQuery.fancybox;
+ }
+
+ if (terp_id) {
+ frame_element.close();
+ return;
+ }
+
if (history.length > 1) {
history.back();
- if(jQuery(window).attr('frameElement')) {
- window.frameElement.close();
- } else {
- jQuery.fancybox.close();
- }
+ frame_element.close();
} else {
window.close();
}
=== modified file 'addons/openerp/static/css/style.css'
--- addons/openerp/static/css/style.css 2011-06-28 13:20:21 +0000
+++ addons/openerp/static/css/style.css 2011-06-29 06:51:08 +0000
@@ -489,6 +489,8 @@
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
+ margin-left: auto;
+ margin-right: auto;
}
.error_message_header {
_______________________________________________
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
