Changeset 1245 in products

Timestamp:

Aug 13, 2009 7:59:22 PM (15 years ago)

Author:

mylan

Message:

Fix bug in canonical path adapter for IPossibleWeblogEntry (Document in case of QuillsEnabled?)

File:

• quintagroup.quills.extras/trunk/quintagroup/quills/extras/adapters.py (modified) (1 diff)

quintagroup.quills.extras/trunk/quintagroup/quills/extras/adapters.py

@@ -18 +18 @@
         purl = getToolByName(self.context,'portal_url')
         pw = getToolByName(self.context,'portal_workflow')
-        if not pw.getInfoFor(self.context, 'review_state') == 'published':
-            return '/' + purl.getRelativeContentURL(self.context)
-        entry = IWeblogEntry(self.context).__of__(self.context.aq_inner.aq_parent)
-        weblog_content = entry.getWeblogContentObject()
-        weblog_path = '/' + purl.getRelativeContentURL(weblog_content)
-        return '%s/%s' % (weblog_path,'/'.join(getArchivePathFor(entry, weblog_content)))
+        relpath = '/' + purl.getRelativeContentURL(self.context)
+        if pw.getInfoFor(self.context, 'review_state') == 'published':
+            entry = IWeblogEntry(self.context).__of__(self.context.aq_inner.aq_parent)
+            weblog_content = entry.getWeblogContentObject()
+            if weblog_content is not None:
+                weblog_path = '/' + purl.getRelativeContentURL(weblog_content)
+                relpath = '%s/%s' % (weblog_path,'/'.join(getArchivePathFor(entry, weblog_content)))
+        return relpath