Merge lp:~openerp-dev/openerp-web/7.0-bug-1097757-ggh into lp:openerp-web/7.0

[Farid Ghanchi]

Hello,

I had fixed the issue of Deactivate Developer mode in 7.0.
About OpenERP >> Activate the Developer mode and Deactivate the Developer mode.

Thanks

[Xavier (Open ERP) (xmo-deactivatedaccount)]

This is broken, for instance the first test will match any "debug" anywhere in the url, if somebody creates a page served through a controller on /debug or the web client is embedded in a page whose URL contains the word "debug", it'll match and this bit will believe it is in debug mode somehow.

Considering we are already using jquery-bbq for query parameters manipulation, I would suggest learning the library and using it for this case as well, instead of doing the same thing by hand incorrectly.

review: Needs Fixing

[lp:~openerp-dev/openerp-web/7.0-bug-1097757-ggh]

3732. By Farid Ghanchi on 2013-02-01

[FIx]Fixed the issue of Deactivate Developer mode with BBQ lib

3733. By Farid Ghanchi on 2013-02-01

[Fix]match debug only querystring(?#) in url

[Farid Ghanchi (gfarid)]

Hello sir,
I have improved code as you suggest
And now debug is match in url but not whole url only query_string area, Its match in only window.location.href means before # code.
Also change code for deactivate mode to remove debug in url using jquery-bbq

Thanks

review: Needs Resubmitting

[Xavier (Open ERP) (xmo-deactivatedaccount)]

1. Why are you still doing a match on the querystring instead of using $.deparam.querystring, which returns a parsed and structured object?
2. The current JS code "untranslates" terms
3. Why is there a reference to "window.location.hash" to deactivate the developer mode? Also why do you check for the devmode status based on the label of a button instead of checking the actual devmode status (which you're supposed to have already done once above, so you could just memoize that)

review: Needs Fixing

[lp:~openerp-dev/openerp-web/7.0-bug-1097757-ggh]

3734. By Farid Ghanchi on 2013-02-15

[Merge] with trunk

3735. By Farid Ghanchi on 2013-02-15

[Fix] Used to deparam.querystring in deactivat devmode

[Farid Ghanchi (gfarid)]

Hello,

Improved code,
Used deparam.querystring() in directly get debug so we remove match code,
and set translated tearms.
And I had used windows.location.hash because its get hash string and debug is set on that(before #) so we used ,'#'.

Thanks...
Farid Ghanchi

review: Needs Resubmitting

Unmerged revisions

3735. By Farid Ghanchi on 2013-02-15

[Fix] Used to deparam.querystring in deactivat devmode

3734. By Farid Ghanchi on 2013-02-15

[Merge] with trunk

3733. By Farid Ghanchi on 2013-02-01

[Fix]match debug only querystring(?#) in url

3732. By Farid Ghanchi on 2013-02-01

[FIx]Fixed the issue of Deactivate Developer mode with BBQ lib

3731. By Farid Ghanchi on 2013-01-29

[Fix ] FIxed the issue of Developer mode Deactivate

=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2013-02-13 14:39:53 +0000
+++ addons/web/static/src/js/chrome.js	2013-02-15 06:16:31 +0000
@@ -1067,9 +1067,17 @@
         var self = this;
         self.rpc("/web/webclient/version_info", {}).done(function(res) {
             var $help = $(QWeb.render("UserMenu.about", {version_info: res}));
+            if ($.deparam.querystring().debug == undefined){
+                $help.find('span.oe_debug_activate').text(_t("Activate"));
+            } else {
+                $help.find('span.oe_debug_activate').text(_t("Deactivate"));
+                }
             $help.find('a.oe_activate_debug_mode').click(function (e) {
                 e.preventDefault();
-                window.location = $.param.querystring( window.location.href, 'debug');
+                if ($help.find('span.oe_debug_activate').text() == _t("Activate")) {
+                    window.location = $.param.querystring( window.location.href, 'debug');
+                } else {
+                    window.location = $.param.querystring( window.location.hash, '#');}
             });
             instance.web.dialog($help, {autoOpen: true,
                 modal: true, width: 507, height: 290, resizable: false, title: _t("About")});
 
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-02-13 15:21:58 +0000
+++ addons/web/static/src/xml/base.xml	2013-02-15 06:16:31 +0000
@@ -413,7 +413,7 @@
 <t t-name="UserMenu.about">
 
     <div class="oe_about">
-      <a class="oe_activate_debug_mode oe_right" href="?debug" style="background-color: white; padding:2px 6px; border-radius: 10px;">Activate the developer mode</a>
+      <a class="oe_activate_debug_mode oe_right" href="?debug" style="background-color: white; padding:2px 6px; border-radius: 10px;"><span class="oe_debug_activate">Activate</span> the developer mode</a>
       <img class="oe_logo" src="/web/static/src/img/logo2.png"/>
       <h3>Version <t t-esc="version_info.server_version"/></h3>