Changeset 2064

Timestamp:

06/25/09 11:21:23 (9 months ago)

Author:

JensDiemer

Message:

 

Files:

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

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

@@ -43 +43 @@
 from pylucid_project.utils import crypt
 
-from pylucid.system.auto_model_info import UpdateInfoBaseModel,AutoSiteM2M
+from pylucid.system.auto_model_info import UpdateInfoBaseModel, AutoSiteM2M
 from pylucid.shortcuts import user_message_or_warn
 from pylucid.fields import ColorValueField
@@ -52 +52 @@
     """
     Manager class for PageTree model
-    
+
     inherited from models.Manager:
         get_or_create() method, witch expected a request object as the first argument.
@@ -67 +67 @@
                 raise
         return root_page
-    
+
     def get_model_instance(self, request, ModelClass, pagetree=None):
         """
@@ -79 +79 @@
         # default Language instance set in system preferences:
         default_lang_entry = request.PYLUCID.default_lang_entry
-        
+
         lang_entry = request.PYLUCID.lang_entry
         default_lang_entry = request.PYLUCID.default_lang_entry
-        
+
         if not pagetree:
             # current pagetree instance
             pagetree = request.PYLUCID.pagetree
-            
+
         queryset = ModelClass.objects.all().filter(page=pagetree)
         try:
@@ -94 +94 @@
             # Get the PageContent entry in the system default language
             return queryset.get(lang=default_lang_entry)
-    
+
     def get_pagemeta(self, request, pagetree=None):
         """
@@ -102 +102 @@
         """
         return self.get_model_instance(request, PageMeta, pagetree)
-    
+
     def get_pagecontent(self, request, pagetree=None):
         """
@@ -110 +110 @@
         """
         return self.get_model_instance(request, PageContent, pagetree)
-    
+
     def get_page_from_url(self, url_path):
         """ returns a tuple the page tree instance from the given url_path"""
@@ -124 +124 @@
             if page.type == PageTree.PLUGIN_TYPE:
                 # It's a plugin
-                prefix_url = "/".join(path[:no+1])
-                rest_url = "/".join(path[no+1:])
+                prefix_url = "/".join(path[:no + 1])
+                rest_url = "/".join(path[no + 1:])
 #                if not rest_url.endswith("/"):
 #                    rest_url += "/"
@@ -141 +141 @@
         if pagetree == None:
             pagetree = request.PYLUCID.pagetree
-        
+
         pagemeta = self.get_pagemeta(request, pagetree)
         url = pagemeta.get_absolute_url()
         title = pagemeta.title_or_slug()
-        
+
         backlist = [{"url": url, "title": title}]
-        
+
         parent = pagetree.parent
-        if parent: 
+        if parent:
             # insert parent links
             backlist = self.get_backlist(request, parent) + backlist
@@ -160 +160 @@
     """
     The CMS page tree
-    
+
     inherited attributes from UpdateInfoBaseModel:
         createtime     -> datetime of creation
@@ -198 +198 @@
     permitViewGroup = models.ForeignKey(Group, related_name="%(class)s_permitViewGroup",
         help_text="Limit viewable to a group?",
-        null=True, blank=True, 
+        null=True, blank=True,
     )
     permitEditGroup = models.ForeignKey(Group, related_name="%(class)s_permitEditGroup",
@@ -217 +217 @@
 
     class Meta:
-        unique_together=(("site", "slug", "parent"),)
-        
+        unique_together = (("site", "slug", "parent"),)
+
         # FIXME: It would be great if we can order by get_absolute_url()
         ordering = ("site", "id", "position")
@@ -232 +232 @@
     permitViewGroup = models.ForeignKey(Group, related_name="%(class)s_permitViewGroup",
         help_text="Limit viewable to a group for a complete language section?",
-        null=True, blank=True, 
+        null=True, blank=True,
     )
 
@@ -250 +250 @@
     page = models.ForeignKey(PageTree)
     lang = models.ForeignKey(Language)
-    
+
     def get_absolute_url(self):
         """ absolute url *with* language code (without domain/host part) """
@@ -256 +256 @@
         page_url = self.page.get_absolute_url()
         return "/" + lang_code + page_url
-    
+
     def get_site(self):
         return self.page.site
-    
+
     class Meta:
         abstract = True
@@ -268 +268 @@
     """
     Meta data for PageContent or PluginPage
-    
+
     inherited attributes from i18nPageTreeBaseModel:
         page -> ForeignKey to PageTree
         lang -> ForeignKey to Language
         get_absolute_url()
-    
+
     inherited attributes from UpdateInfoBaseModel:
         createtime     -> datetime of creation
@@ -293 +293 @@
     permitViewGroup = models.ForeignKey(Group, related_name="%(class)s_permitViewGroup",
         help_text="Limit viewable to a group?",
-        null=True, blank=True, 
+        null=True, blank=True,
     )
 
@@ -302 +302 @@
     def __unicode__(self):
         return u"PageMeta for page: '%s' (lang: '%s')" % (self.page.slug, self.lang.code)
-    
-    class Meta:
-        unique_together = (("page","lang"),)
+
+    class Meta:
+        unique_together = (("page", "lang"),)
         ordering = ("page", "lang")
 
@@ -313 +313 @@
     """
     A plugin page
-    
+
     inherited attributes from i18nPageTreeBaseModel:
         page -> ForeignKey to PageTree
         lang -> ForeignKey to Language
         get_absolute_url()
-    
+
     inherited attributes from UpdateInfoBaseModel:
         createtime     -> datetime of creation
@@ -325 +325 @@
         lastupdateby   -> ForeignKey to user who has edited this entry
     """
-    APP_LABEL_CHOICES = [(app,app) for app in settings.INSTALLED_APPS]
-    
+    APP_LABEL_CHOICES = [(app, app) for app in settings.INSTALLED_APPS]
+
     pagemeta = models.ForeignKey(PageMeta)
-    
+
     app_label = models.CharField(max_length=256, choices=APP_LABEL_CHOICES,
         help_text="The app lable witch is in settings.INSTALLED_APPS"
     )
-    
+
     def title_or_slug(self):
         """ The page title is optional, if not exist, used the slug from the page tree """
         return self.pagemeta.title or self.page.slug
-    
+
     def get_plugin_name(self):
         return self.app_label.split(".")[-1]
-    
+
     def save(self, *args, **kwargs):
         if not self.page.type == self.page.PLUGIN_TYPE:
@@ -345 +345 @@
             raise AssertionError("Plugin can only exist on a plugin type tree entry!")
         return super(PluginPage, self).save(*args, **kwargs)
-    
+
     def __unicode__(self):
         return u"PluginPage '%s' (page: %s)" % (self.app_label, self.page)
-    
-    class Meta:
-        unique_together = (("page","lang"),)
+
+    class Meta:
+        unique_together = (("page", "lang"),)
         ordering = ("page", "lang")
 
@@ -360 +360 @@
     """
     Manager class for PageContent model
-    
+
     inherited from models.Manager:
         get_or_create() method, witch expected a request object as the first argument.
-    """    
+    """
     def get_sub_pages(self, pagecontent):
         """
@@ -373 +373 @@
         current_page = pagecontent.page
         sub_pages = PageContent.objects.all().filter(page__parent=current_page, lang=current_lang)
-        return sub_pages   
+        return sub_pages
 
 
@@ -392 +392 @@
     """
     # IDs used in other parts of PyLucid, too
-    MARKUP_CREOLE       = 6
-    MARKUP_HTML         = 0
-    MARKUP_HTML_EDITOR  = 1
-    MARKUP_TINYTEXTILE  = 2
-    MARKUP_TEXTILE      = 3
-    MARKUP_MARKDOWN     = 4
-    MARKUP_REST         = 5
+    MARKUP_CREOLE = 6
+    MARKUP_HTML = 0
+    MARKUP_HTML_EDITOR = 1
+    MARKUP_TINYTEXTILE = 2
+    MARKUP_TEXTILE = 3
+    MARKUP_MARKDOWN = 4
+    MARKUP_REST = 5
 
     MARKUP_CHOICES = (
@@ -411 +411 @@
     MARKUP_DICT = dict(MARKUP_CHOICES)
     #--------------------------------------------------------------------------
-    
+
     objects = PageContentManager()
 
@@ -433 +433 @@
 
     class Meta:
-        unique_together = (("page","lang"),)
+        unique_together = (("page", "lang"),)
         ordering = ("page", "lang")
 
@@ -445 +445 @@
     """
     name = models.CharField(max_length=255, help_text="The name of this color scheme.")
-    
+
     def update(self, colors):
         assert isinstance(colors, dict)
@@ -474 +474 @@
         colors = self.all().filter(colorscheme=colorscheme)
         color_list = colors.values_list('name', 'value')
-        return dict([(name, "#%s" % value) for name,value in color_list])
+        return dict([(name, "#%s" % value) for name, value in color_list])
 
 class Color(AutoSiteM2M, UpdateInfoBaseModel):
@@ -483 +483 @@
     """
     objects = ColorManager()
-    
+
     colorscheme = models.ForeignKey(ColorScheme)
     name = models.CharField(max_length=128,
@@ -489 +489 @@
     )
     value = ColorValueField(help_text="CSS hex color value.")
-    
+
     def save(self, *args, **kwargs):
         self.name = self.name.replace(" ", "_")
         new_name = self.name
-        old_name = Color.objects.get(id=self.id).name
-        if new_name != old_name:
-            # Color name has been changed -> Rename template placeholder in every headfile, too.
-            designs = Design.objects.all().filter(colorscheme=self.colorscheme)
-            for design in designs:
-                headfiles = design.headfiles.all()
-                for headfile in headfiles:
-                    if headfile.render != True: # File used no color placeholder
-                        continue
-
-                    old_content = headfile.content
-                    # FIXME: Use flexibler regexp. for this:
-                    new_content = old_content.replace("{{ %s }}" % old_name, "{{ %s }}" % new_name)
-                    if old_content == new_content:
-                        # content not changed?!?
-                        user_message_or_warn(
-                            "Color '{{ %s }}' not exist in headfile %r" % (old_name, headfile)
-                        )
-                        continue
-                    
-                    if settings.DEBUG:
-                        user_message_or_warn(
-                            "change color name from '%s' to '%s' in %r" % (old_name, new_name, headfile)
-                        )
-                    headfile.content = new_content
-                    headfile.save()
+        try:
+            old_name = Color.objects.get(id=self.id).name
+        except Color.DoesNotExist:
+            # New color
+            pass
+        else:
+            if new_name != old_name:
+                # Color name has been changed -> Rename template placeholder in every headfile, too.
+                designs = Design.objects.all().filter(colorscheme=self.colorscheme)
+                for design in designs:
+                    headfiles = design.headfiles.all()
+                    for headfile in headfiles:
+                        if headfile.render != True: # File used no color placeholder
+                            continue
+
+                        old_content = headfile.content
+                        # FIXME: Use flexibler regexp. for this:
+                        new_content = old_content.replace("{{ %s }}" % old_name, "{{ %s }}" % new_name)
+                        if old_content == new_content:
+                            # content not changed?!?
+                            user_message_or_warn(
+                                "Color '{{ %s }}' not exist in headfile %r" % (old_name, headfile)
+                            )
+                            continue
+
+                        if settings.DEBUG:
+                            user_message_or_warn(
+                                "change color name from '%s' to '%s' in %r" % (old_name, new_name, headfile)
+                            )
+                        headfile.content = new_content
+                        headfile.save()
 
         return super(Color, self).save(*args, **kwargs)
-    
+
     def __unicode__(self):
         return u"Color '%s' #%s (%s)" % (self.name, self.value, self.colorscheme)
-    
-    class Meta:
-        unique_together=(("colorscheme", "name"),)
+
+    class Meta:
+        unique_together = (("colorscheme", "name"),)
         ordering = ("colorscheme", "name")
 
@@ -537 +542 @@
     """
     Page design: template + CSS/JS files
-    
+
     inherited attributes from AutoSiteM2M:
         site    -> ManyToManyField to Site
         on_site -> sites.managers.CurrentSiteManager instance
-    
+
     inherited attributes from UpdateInfoBaseModel:
         createtime     -> datetime of creation
@@ -549 +554 @@
     """
     objects = DesignManager()
-    
+
     name = models.CharField(unique=True, max_length=150, help_text="Name of this design combination",)
     template = models.CharField(max_length=128, help_text="filename of the used template for this page")
@@ -566 +571 @@
         sites = [site.name for site in self.site.all()]
         return u"Page design '%s' (on sites: %r)" % (self.name, sites)
-    
+
     class Meta:
         ordering = ("template",)
@@ -580 +585 @@
         db_instance = self.get(filename=filename)
         return headfile.HeadfileLink(filename=db_instance.filename)#, content=db_instance.content)
-        
+
 
 class EditableHtmlHeadFile(AutoSiteM2M, UpdateInfoBaseModel):
     """
     Storage for editable static text files, e.g.: stylesheet / javascript.
-    
+
     inherited attributes from AutoSiteM2M:
         site    -> ManyToManyField to Site
         on_site -> sites.managers.CurrentSiteManager instance
-    
+
     inherited attributes from UpdateInfoBaseModel:
         createtime     -> datetime of creation
@@ -597 +602 @@
     """
     objects = EditableHtmlHeadFileManager()
-    
+
     filepath = models.CharField(max_length=256)
     mimetype = models.CharField(max_length=64)
@@ -604 +609 @@
         help_text='Additional html tag attributes (CSS example: media="screen")'
     )
-    render = models.BooleanField(default = False,
+    render = models.BooleanField(default=False,
         help_text="Are there CSS ColorScheme entries in the content?"
     )
     description = models.TextField(null=True, blank=True)
     content = models.TextField()
-    
+
     def get_color_filepath(self, colorscheme):
         """ Colorscheme + filepath """
         assert isinstance(colorscheme, ColorScheme)
         return os.path.join("ColorScheme_%s" % colorscheme.pk, self.filepath)
-        
+
     def get_path(self, colorscheme):
         """ Path for filesystem cache path and link url. """
@@ -621 +626 @@
             self.get_color_filepath(colorscheme)
         )
-    
+
     def get_cachepath(self, colorscheme):
         """
@@ -628 +633 @@
         """
         return os.path.join(settings.MEDIA_ROOT, self.get_path(colorscheme))
-        
+
     def get_rendered(self, colorscheme):
         color_dict = Color.objects.get_color_dict(colorscheme)
-        return render.render_string_template(self.content, color_dict)        
-        
+        return render.render_string_template(self.content, color_dict)
+
     def save_cache_file(self, colorscheme):
         """
@@ -639 +644 @@
         """
         cachepath = self.get_cachepath(colorscheme)
-        
+
         def _save_cache_file(auto_create_dir=True):
             rendered_content = self.get_rendered(colorscheme)
@@ -648 +653 @@
             except IOError, err:
                 if auto_create_dir and err.errno == errno.ENOENT: # No 2: No such file or directory
-                    # Try to create the out dir and save the cache file  
+                    # Try to create the out dir and save the cache file
                     path = os.path.dirname(cachepath)
                     if not os.path.isdir(path):
@@ -722 +727 @@
 
 
-    
+
 class UserProfile(AutoSiteM2M, UpdateInfoBaseModel):
     """
     Stores additional information about PyLucid users
     http://docs.djangoproject.com/en/dev/topics/auth/#storing-additional-information-about-users
-    
+
     Created via post_save signal, if a new user created.
-    
+
     inherited attributes from AutoSiteM2M:
         site    -> ManyToManyField to Site
@@ -735 +740 @@
     """
     user = models.ForeignKey(User, unique=True, related_name="%(class)s_user")
-    
+
     sha_login_checksum = models.CharField(max_length=192,
         help_text="Checksum for PyLucid JS-SHA-Login"
@@ -742 +747 @@
         help_text="Salt value for PyLucid JS-SHA-Login"
     )
-    
+
     # TODO: Overwrite help_text:
 #    site = models.ManyToManyField(Site,
 #        help_text="User can access only these sites."
 #    )
-    
+
     def set_sha_login_password(self, raw_password):
         """
@@ -766 +771 @@
         sites = self.site.all()
         return ", ".join([site.name for site in sites])
-    
+
     class Meta:
         ordering = ("user",)
@@ -775 +780 @@
 def cache_headfiles(sender, **kwargs):
     """
-    One colorscheme was changes: resave all cache headfiles with new color values. 
+    One colorscheme was changes: resave all cache headfiles with new color values.
     """
     colorscheme = kwargs["instance"]
@@ -784 +789 @@
         for headfile in headfiles:
             headfile.save_cache_file(colorscheme)
-    
+
 signals.post_save.connect(cache_headfiles, sender=ColorScheme)
 
@@ -793 +798 @@
     """ signal handler: creating user profile, after a new user created. """
     user = kwargs["instance"]
-        
+
     userprofile, created = UserProfile.objects.get_or_create(user=user)
     if created:
         user_message_or_warn("UserProfile entry for user '%s' created." % user)
-#            
+#
 #        if not user.is_superuser: # Info: superuser can automaticly access all sites
 #            site = Site.objects.get_current()
 #            userprofile.site.add(site)
-#            user_message_or_warn("Add site '%s' to '%s' UserProfile." % (site.name, user))            
+#            user_message_or_warn("Add site '%s' to '%s' UserProfile." % (site.name, user))
 
 signals.post_save.connect(create_user_profile, sender=User)
@@ -826 +831 @@
     # Use the original method to set the django User password:
     orig_set_password(user, raw_password)
-    
+
     userprofile, created = UserProfile.objects.get_or_create(user=user)
     if created:
@@ -836 +841 @@
 
 
-# replace the method 
+# replace the method
 User.set_password = set_password