Changeset 12243 for main/waeup.ikoba/trunk/src/waeup/ikoba

Timestamp:

15 Dec 2014, 11:18:31 (10 years ago)

Author:

Henrik Bettermann

Message:

Redirect to portal root if content is not yet published.

Extend tests.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Files:

• browser.py (modified) (1 diff)
• fileviewlets.py (modified) (1 diff)
• tests/test_browser.py (modified) (3 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/browser.py

@@ -202 +202 @@
             self.flash(_('The document requested has not yet been published.'),
                 type="warning")
-            self.redirect(self.url(self.context))
+            self.redirect(self.application_url())
         super(HTMLDocumentDisplayContentPage, self).update()
         return

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/fileviewlets.py

@@ -69 +69 @@
             self.flash(_('The document requested has not yet been published.'),
                 type="warning")
-            self.redirect(self.url(self.context))
+            self.redirect(self.application_url())
         return

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_browser.py

@@ -158 +158 @@
             in self.browser.contents)
         IWorkflowState(document).setState(PUBLISHED)
-        self.browser.getLink("sample.pdf").click()
+        self.browser.open(self.container_path + '/d101/sample.pdf')
         self.assertEqual(
             self.browser.headers['content-type'], 'application/pdf')
@@ -240 +240 @@
         self.assertTrue(
             '<h1>Hallo Welt</h1>' in self.browser.contents)
+        # The content can't be rendered yet
+        self.browser.open(self.container_path + '/d101/display')
+        self.assertTrue(
+            'The document requested has not yet been published'
+            in self.browser.contents)
+        # We have been redirected to the portal root
+        self.assertEqual(self.browser.url, 'http://localhost/app')
 
         # Transitions can be performed
@@ -248 +255 @@
         self.assertEqual(document.state, 'published')
 
+        # The content can be rendered
+        self.browser.open(self.container_path + '/d101/display')
+        self.assertTrue(
+            '<h1>Hallo Welt</h1>' in self.browser.contents)
+
         # Documents can be removed
         self.browser.getLink("en", index=2).click()