Timeout edge redirect notice logic inverted

[William Grant]

The edge redirection notifications presented on timeouts are now being shown on lpnet, and not on edge. That's a bit useless.

devel r8529 has the below change. Now, my logic is a little rusty, but I think the disjuncts need to be inverted too.

=== modified file 'lib/canonical/launchpad/templates/launchpad-requestexpired.pt'
--- lib/canonical/launchpad/templates/launchpad-requestexpired.pt 2009-05-11 14:31:38 +0000
+++ lib/canonical/launchpad/templates/launchpad-requestexpired.pt 2009-05-27 22:29:02 +0000
@@ -25,7 +25,10 @@
       <script type="text/javascript">
         var edge_cookie = document.cookie.match('edge');
         var edge_host = document.location.hostname.match('edge');
- if (edge_cookie && edge_host) {
+
+ // Logic has been inverted in the next line to avoid breaking
+ // XHTML compliance of the template due to ampersand usage.
+ if (!(edge_cookie || edge_host)) {
           redirect_notice_div = document.getElementById('redirect_notice');
           redirect_notice_div.style.display = "block";
         };

[Stuart P. Bentley (stuart)]

Couldn't you just use a CDATA block (http://javascript.about.com/library/blxhtml.htm) to make it XHTML compliant without messing with the code?

[Martin Pool (mbp)]

Since the fix seems to be known couldn't someone just land it?

[Francis J. Lacoste (flacoste)]

Submit a merge proposal.

[Guilherme Salgado (salgado)]

The current timeout page has the link to disable edge redirects at the footer, just like other pages, so I'm wondering if it'd make sense to fix the javascript above so that the notification message (with a link identical to the one at the bottom, but more text) at the top or if I should just remove it.

[Guilherme Salgado (salgado)]

In fact, the current timeout page does not have the link at the bottom, but with my fix for bug 528184 it does.

[Ursula Junque (ursinha)]

Fixed in stable r10489 <http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/10489>

[Curtis Hovey (sinzui)]

Fixed released in launchpad-project 10.03.