Changeset 2026

Timestamp:

06/10/09 15:47:12 (9 months ago)

Author:

JensDiemer

Message:

* make: EditableHtmlHeadFile?.get_absolute_url()
*

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/models.py (modified) (2 diffs)
• media/PyLucid/pylucid_js_tools.js (added)
• pylucid_plugins/admin_menu/templates/admin_menu/admin_top_menu.html (modified) (2 diffs)
• tests/test_Design.py (modified) (5 diffs)
• tests/test_tools/pylucid_test_data.py (modified) (2 diffs)

branches/0.9/pylucid_project/apps/pylucid/models.py

@@ -517 +517 @@
             if settings.DEBUG:
                 warnings.warn("EditableHtmlHeadFile cached successful into: %r" % cachepath)
-                
-    def get_headfilelink(self):
-        """ Get the link url to this head file. """
+
+    def get_absolute_url(self):
         cachepath = self.get_cachepath()
         if os.path.isfile(cachepath):
             # The file exist in media path -> Let the webserver send this file ;)
-            url = posixpath.join(
+            return posixpath.join(
                 settings.MEDIA_URL, settings.PYLUCID.PYLUCID_MEDIA_DIR, settings.PYLUCID.CACHE_DIR,
                 self.filepath
@@ -529 +528 @@
         else:
             # not cached into filesystem -> use pylucid.views.send_head_file for it
-            url = reverse('PyLucid-send_head_file', kwargs={"filepath":self.filepath})
+            return reverse('PyLucid-send_head_file', kwargs={"filepath":self.filepath})
+
+
+    def get_headfilelink(self):
+        """ Get the link url to this head file. """
+        url = self.get_absolute_url()
         return headfile.HeadfileLink(url)
 

branches/0.9/pylucid_project/pylucid_plugins/admin_menu/templates/admin_menu/admin_top_menu.html

@@ -9 +9 @@
 <script type="text/javascript" src="{{ PyLucid_media_url }}superfish/superfish.js" onerror="JavaScript:alert('{{ PyLucid_media_url }}superfish/superfish.js');" ></script>
 <script type="text/javascript" src="{{ PyLucid_media_url }}superfish/pylucid_superfish_init.js" onerror="JavaScript:alert('{{ PyLucid_media_url }}superfish/pylucid_superfish_init.js');" ></script>
+<script type="text/javascript" src="{{ PyLucid_media_url }}pylucid_js_tools.js" onerror="JavaScript:alert('{{ PyLucid_media_url }}pylucid_js_tools.js');" ></script>
 <style type="text/css">
 <!--
@@ -40 +41 @@
         <a href="{{ admin_menu_link }}">{% trans 'admin menu' %}</a>
         <ul>
-            <li><a href="{{ admin_menu_link }}">in popup win</a></li>
+            <li><a href="{{ admin_menu_link }}?_popup=1" onclick="OpenInWindow(this); return false">in popup win</a></li>
         </ul>
     </li>

branches/0.9/pylucid_project/tests/test_Design.py

@@ -16 +16 @@
 
 CSS_LINK = '<link href="%s" rel="stylesheet" type="text/css" />'
+JS_LINK = '<script src="%s" type="text/javascript" language="javascript" /></script>'
 
 
@@ -22 +23 @@
         super(DesignTest, self).__init__(*args, **kwargs)
         
-        self.testcss1 = EditableHtmlHeadFile.objects.get(filepath=pylucid_test_data.TEST_CSS_FILEPATH1)
-        self.testcss2 = EditableHtmlHeadFile.objects.get(filepath=pylucid_test_data.TEST_CSS_FILEPATH2)
+        self.test_css = EditableHtmlHeadFile.objects.get(filepath=pylucid_test_data.TEST_CSS_FILEPATH)
+        self.test_js = EditableHtmlHeadFile.objects.get(filepath=pylucid_test_data.TEST_JS_FILEPATH)
         
         # fake django HttpRequest object, needed in UpdateInfoBaseModel save() method
         self.fake_request = pylucid_test_data.get_fake_request(usertype="superuser")
 
-    def test_cached(self):
-        """
-        Test the stylesheet link, if the css file was cached into the filesystem.
-        """
-        # Create the cache file, if not exist
-        for headfile in (self.testcss1, self.testcss2):
-            cachepath = headfile.get_cachepath()
-            if not os.path.isfile(cachepath):
-                os.makedirs(os.path.dirname(cachepath)) # Cache dir doesn't exist?
-                headfile.save(self.fake_request) # The save method should create the cache file
-            # Check if file exist
-            self.failUnless(os.path.isfile(cachepath), "Can't create cache file???")
+    def _assert_headfiles(self, test_css_url, test_js_url):
+        """ Test get_absolute_url() and head links in reponse content """
+        self.failUnlessEqual(self.test_css.get_absolute_url(), test_css_url)
+        self.failUnlessEqual(self.test_js.get_absolute_url(), test_js_url)
             
         # Test urls in the page content
@@ -48 +41 @@
                 '<title>1-rootpage title',
                 
-                # Design head file link with filesystem cache url:
-                CSS_LINK % "/media/PyLucid/headfile_cache/unittest/test1.css",
-                CSS_LINK % "/media/PyLucid/headfile_cache/unittest/test2.css",
+                # Design head file links:
+                CSS_LINK % test_css_url,
+                JS_LINK % test_js_url,
             ),
             must_not_contain=(
@@ -56 +49 @@
             ),
         )
+        
+    def test_cached(self):
+        """
+        Test the stylesheet link, if the css file was cached into the filesystem.
+        """       
+        # Create the cache file, if not exist
+        for headfile in (self.test_css, self.test_js):
+            cachepath = headfile.get_cachepath()
+            if not os.path.isfile(cachepath):
+                os.makedirs(os.path.dirname(cachepath)) # Cache dir doesn't exist?
+                headfile.save(self.fake_request) # The save method should create the cache file
+            # Check if file exist
+            self.failUnless(os.path.isfile(cachepath), "Can't create cache file???")
+
+        # Test get_absolute_url() and head links in reponse content
+        self._assert_headfiles(
+            "/media/PyLucid/headfile_cache/unittest/test.css",
+            "/media/PyLucid/headfile_cache/unittest/test.js"
+        )            
+
 
     def test_not_cached(self):
@@ -62 +75 @@
         """
         # remove style cache file, if exist
-        for headfile in (self.testcss1, self.testcss2):
+        for headfile in (self.test_css, self.test_js):
             cachepath = headfile.get_cachepath()
             if os.path.isfile(cachepath):
                 os.remove(cachepath)
             self.failUnless(not os.path.isfile(cachepath), "Cache file exist???")
-        
-        # Check the urls in the page content
-        response = self.client.get("/")
-        self.assertResponse(response,
-            must_contain=(
-                '1-rootpage content', # PageContent
-                '<title>1-rootpage title',
-                
-                # Design head file link with PyLucid own view url:
-                CSS_LINK % "/headfile/unittest/test1.css",
-                CSS_LINK % "/headfile/unittest/test2.css",
-            ),
-            must_not_contain=(
-                "Traceback",
-            ),
+
+        # Test get_absolute_url() and head links in reponse content
+        self._assert_headfiles(
+            "/headfile/unittest/test.css",
+            "/headfile/unittest/test.js"
         )
+
 
 

branches/0.9/pylucid_project/tests/test_tools/pylucid_test_data.py

@@ -152 +152 @@
     },
 }
-TEST_CSS_FILEPATH1 = "unittest/test1.css"
-TEST_CSS_FILEPATH2 = "unittest/test2.css"
+TEST_CSS_FILEPATH = "unittest/test.css"
+TEST_JS_FILEPATH = "unittest/test.js"
 
 TEST_HEADFILES = {
-    TEST_CSS_FILEPATH1: {
-        "description": "CSS file 1 for unittests.",
+    TEST_CSS_FILEPATH: {
+        "description": "CSS file for unittests.",
         "content": ".test1 { color:red; } /* "+SITEINFO_TAG+" */",
     },
-    TEST_CSS_FILEPATH2: {
-        "description": "CSS file 2 for unittests.",
-        "content": ".test2 { color:red; } /* "+SITEINFO_TAG+" */",
+    TEST_JS_FILEPATH: {
+        "description": "JS file for unittests.",
+        "content": "alert('Unittest JS file exists on \"+SITEINFO_TAG+\" ;)');",
     }
 }
@@ -168 +168 @@
     "unittest_design": {
         "template_name": "site_template/normal.html",
-        "headfiles": (TEST_CSS_FILEPATH1,TEST_CSS_FILEPATH2),
+        "headfiles": (TEST_CSS_FILEPATH,TEST_JS_FILEPATH),
     },
 }