[Python-apps-commits] r7884 - in packages/openerp6/trunk (4 files)

[xnox-guest at users.alioth.debian.org]

    Date: Tuesday, November 29, 2011 @ 20:11:50
  Author: xnox-guest
Revision: 7884

last patch name fix & fuzz

Added:
  packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace.patch
    (from rev 7883, packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace)
Modified:
  packages/openerp6/trunk/debian/	(properties)
  packages/openerp6/trunk/debian/patches/series
Deleted:
  packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace

Deleted: packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace
===================================================================
--- packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace	2011-11-29 20:11:45 UTC (rev 7883)
+++ packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace	2011-11-29 20:11:50 UTC (rev 7884)
@@ -1,11 +0,0 @@
---- a/web/addons/openerp/controllers/actions.py
-+++ b/web/addons/openerp/controllers/actions.py
-@@ -366,7 +366,7 @@
-            urllib.urlencode({'payload': compressed_payload}))
- 
-     if open_new_tab:
--        url = '/?' + urllib.urlencode({'next': url})
-+        url = '/openerp/?' + urllib.urlencode({'next': url})
-         
-     cherrypy.response.headers['X-Target'] = action['target']
-     cherrypy.response.headers['X-Location'] = url

Copied: packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace.patch (from rev 7883, packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace)
===================================================================
--- packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace.patch	                        (rev 0)
+++ packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace.patch	2011-11-29 20:11:50 UTC (rev 7884)
@@ -0,0 +1,11 @@
+--- a/web/addons/openerp/controllers/actions.py
++++ b/web/addons/openerp/controllers/actions.py
+@@ -366,7 +366,7 @@
+            urllib.urlencode({'payload': compressed_payload}))
+ 
+     if open_new_tab:
+-        url = '/?' + urllib.urlencode({'next': url})
++        url = '/openerp/?' + urllib.urlencode({'next': url})
+         
+     cherrypy.response.headers['X-Target'] = action['target']
+     cherrypy.response.headers['Location'] = url

Modified: packages/openerp6/trunk/debian/patches/series
===================================================================
--- packages/openerp6/trunk/debian/patches/series	2011-11-29 20:11:45 UTC (rev 7883)
+++ packages/openerp6/trunk/debian/patches/series	2011-11-29 20:11:50 UTC (rev 7884)
@@ -3,7 +3,7 @@
 01_server/fix-yaml-import.patch
 01_server/manpage-whatis.patch
 02_web/config-changes.patch
-02_web/fix-popup-namespace
+02_web/fix-popup-namespace.patch
 02_web/fix-refresh-loop.patch
 02_web/tinydict-getstate.patch
 02_web/wsgi-x-location.patch