Changeset 319

Timestamp:

07/02/09 15:58:36 (4 years ago)

Author:

brent

Message:

Fixed bare anchor tags and javascript links to not be filtered.

Location:

enpraxis.staticsite/trunk/enpraxis/staticsite

Files:

• tests/test_unit_staticutility.py (modified) (1 diff)
• utilities/staticsiteutility.py (modified) (2 diffs)

enpraxis.staticsite/trunk/enpraxis/staticsite/tests/test_unit_staticutility.py

@@ -17 +17 @@
     def test_filterDocumentLink(self):
         """ Test combined document filter functions """
+        ssutil = getUtility(IStaticSiteUtility)
+        link = ssutil.filterDocumentLink('#TOP', '', None, [])
+        self.assertEqual(link, '#TOP')
+        link = ssutil.filterDocumentLink('javascript:void(0);', '', None, [])
+        self.assertEqual(link, 'javascript:void(0);')
+        
 
     def test_convertLinkToAbsolute(self):

enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py

@@ -468 +468 @@
     def filterDocumentLink(self, link, current, portal, views):
         lnk = link
-        lnk = self._convertLinkToAbsolute(lnk, current)
-        lnk = self._convertObjectLink(lnk, portal, views)
-        lnk = self._convertLinkToRelative(lnk, current)
+        url = urlparse(lnk)
+        if url[2] and 'javascript' != url[0]:
+            lnk = self._convertLinkToAbsolute(lnk, current)
+            lnk = self._convertObjectLink(lnk, portal, views)
+            lnk = self._convertLinkToRelative(lnk, current)
         return lnk
 
@@ -512 +514 @@
                     if view:
                         path = '/'.join(h) + '-%s.html' %view
+                    elif h:
+                        path = '/'.join(h) + '.html'
                     else:
-                        path = '/'.join(h) + '.html'
+                        path = ''
                     result = urlunparse((hr[0], hr[1], path, hr[3], hr[4], hr[5]))
         return result