Changeset 11058

Timestamp:

6 Feb 2014, 08:54:59 (11 years ago)

Author:

Henrik Bettermann

Message:

Use absolute URLs. Otherwise images and files might not be found.

Location:

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa

Files:

• browser/templates/filedisplay.pt (modified) (1 diff)
• browser/templates/fileupload.pt (modified) (1 diff)
• students/browser_templates/imagedisplay.pt (modified) (1 diff)
• students/browser_templates/imageupload.pt (modified) (1 diff)
• students/tests/test_browser.py (modified) (4 diffs)

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/filedisplay.pt

@@ -4 +4 @@
   </td>
   <td>
-    <a tal:attributes="href viewlet/download_name"
+    <a tal:attributes="href python: view.url(context, viewlet.download_name)"
        tal:content="viewlet/download_name"
        target="image">

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/fileupload.pt

@@ -5 +5 @@
   <td>
     <tal:file tal:condition="viewlet/file_exists">
-      <a tal:attributes="href viewlet/download_name"
+      <a tal:attributes="href python: view.url(context, viewlet.download_name)"
          tal:content="viewlet/title"
          target="image">

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/imagedisplay.pt

@@ -4 +4 @@
   </td>
   <td>
-      <img height="125px" tal:attributes="src viewlet/download_name" />
+      <img height="125px"
+         tal:attributes="src python: view.url(context, viewlet.download_name)" />
       <br />
   </td>

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/imageupload.pt

@@ -5 +5 @@
   <td>
     <img align="middle" height="125px"
-         tal:attributes="src viewlet/download_name" />
+         tal:attributes="src python: view.url(context, viewlet.download_name)" />
     <input type="submit" tal:condition="viewlet/file_exists"
      tal:attributes="id python:('delete_%s' % viewlet.input_name);

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/tests/test_browser.py

@@ -613 +613 @@
         # There is a correct <img> link included
         self.assertTrue(
-            '<a target="image" href="birth_certificate">'
+            'href="http://localhost/app/students/K1000000/birth_certificate"'
             in self.browser.contents)
         # Browsing the link shows a real image
@@ -673 +673 @@
             name='upload_passportuploadmanage').click()
         self.assertTrue(
-            '<img align="middle" height="125px" src="passport.jpg" />'
+            'src="http://localhost/app/students/K1000000/passport.jpg"'
             in self.browser.contents)
         # We remove the passport file again
@@ -2268 +2268 @@
             name='upload_passportuploadedit').click()
         self.assertTrue(
-            '<img align="middle" height="125px" src="passport.jpg" />'
+            'src="http://localhost/app/students/K1000000/passport.jpg"'
             in self.browser.contents)
         # Students can open admission letter
@@ -2326 +2326 @@
             name='upload_birthcertificateupload').click()
         self.assertTrue(
-            '<a target="image" href="birth_certificate">Birth Certificate Scan</a>'
+            'href="http://localhost/app/students/K1000000/birth_certificate"'
             in self.browser.contents)
         # Students can open clearance slip