Changeset 2066

Timestamp:

06/25/09 11:45:33 (9 months ago)

Author:

JensDiemer

Message:

update save_all_color_cachfiles() and bugfix: if no colorscheme used.

Files:

• branches/0.9/pylucid_project/apps/pylucid/models.py (modified) (3 diffs)

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

@@ -615 +615 @@
     content = models.TextField()
 
-    def get_color_filepath(self, colorscheme):
+    def get_color_filepath(self, colorscheme=None):
         """ Colorscheme + filepath """
-        assert isinstance(colorscheme, ColorScheme)
-        return os.path.join("ColorScheme_%s" % colorscheme.pk, self.filepath)
+        if colorscheme:
+            assert isinstance(colorscheme, ColorScheme)
+            return os.path.join("ColorScheme_%s" % colorscheme.pk, self.filepath)
+        else:
+            # The Design used no colorscheme
+            return self.filepath
 
     def get_path(self, colorscheme):
@@ -672 +676 @@
 
     def save_all_color_cachfiles(self):
-        """ this headfile was changed: resave all cache files in every existing colors"""
-        warnings.warn("TODO")
-#        designs = Design.objects.all().filter(colorscheme=colorscheme)
-#        for design in designs:
-#            print design
-#            headfiles = design.headfiles.all()
-#            for headfile in headfiles:
-#                print headfile
-#                headfile.save_cache_file(colorscheme)
+        """
+        this headfile was changed: resave all cache files in every existing colors
+        TODO: Update Queyset lookup
+        """
+        designs = Design.objects.all()
+        for design in designs:
+            headfiles = design.headfiles.all()
+            for headfile in headfiles:
+                if headfile == self:
+                    colorscheme = design.colorscheme
+                    self.save_cache_file(colorscheme)
 
     def get_absolute_url(self, colorscheme):
@@ -690 +696 @@
             # not cached into filesystem -> use pylucid.views.send_head_file for it
             url = reverse('PyLucid-send_head_file', kwargs={"filepath":self.filepath})
-            return url + "?ColorScheme=%s" % colorscheme.pk
+            if colorscheme:
+                return url + "?ColorScheme=%s" % colorscheme.pk
+            else:
+                # Design used no colorscheme
+                return url
 
     def get_headfilelink(self, colorscheme):