Handle resource files with .htm extention properly as page template resources.

LP #411837

Handle resource files with .htm extention properly as page template resources.
LP #411837
cbee56f2 · Tres Seaver · fb32c3e9 · cbee56f2 · cbee56f2 · cbee56f2
Commit cbee56f2 authored May 08, 2010 by Tres Seaver
4 changed files
--- a/doc/CHANGES.rst
+++ b/doc/CHANGES.rst
@@ -36,6 +36,9 @@ Features Added
 Bugs Fixed
 ++++++++++

+- LP #411837:  Handle resource files with ``.htm`` extention properly,
+  as page template resources.
+
 - LP #435728:  Fix indentation of OFSP/help/sequence.py docstring.

 - LP #574286:  Ensure that mailhosts which share a queue directory do not

--- a/src/Products/Five/browser/resource.py
+++ b/src/Products/Five/browser/resource.py
@@ -132,6 +132,7 @@ class DirectoryResource(Resource, directoryresource.DirectoryResource):
        'pt':   PageTemplateResourceFactory,
        'zpt':  PageTemplateResourceFactory,
        'html': PageTemplateResourceFactory,
+        'htm':  PageTemplateResourceFactory,
        }

    default_factory = FileResourceFactory

--- a/src/Products/Five/browser/tests/resource_ftest.txt
+++ b/src/Products/Five/browser/tests/resource_ftest.txt
@@ -92,6 +92,21 @@ Page templates aren't guaranteed to render, so exclude them from the test:
  ...     response = self.publish(base_url % r, basic='manager:r00t')
  ...     self.assertEquals(200, response.getStatus())

+  >>> print http(r'''
+  ... GET /test_folder_1_/testoid/++resource++fivetest_resources/resource_subdir/resource.htm HTTP/1.1
+  ... Authorization: Basic manager:r00t
+  ... ''')
+  HTTP/1.1 200 OK
+  ...
+  <html>
+      <head>
+      </head>
+      <body>
+          This .html should not have a base tag automatically
+          added to the header.
+      </body>
+  </html>
+  <BLANKLINE>

 We also can traverse into sub-directories:


--- a/src/Products/Five/browser/tests/resource_subdir/resource.htm
+++ b/src/Products/Five/browser/tests/resource_subdir/resource.htm
+<html>
+    <head>
+    </head>
+    <body>
+        This .html should not have a base tag automatically
+        added to the header.
+    </body>
+</html>