Merge branch 'release-0.15'

[snf-cloudcms] / cloudcms / models.py

diff --git a/cloudcms/models.py b/cloudcms/models.py
index d17cb9f..0ea46a6 100644 (file)
--- a/cloudcms/models.py
+++ b/cloudcms/models.py
@@ -63,7 +63,7 @@ class Application(models.Model):
         ('warning','Warning'),
         ('info','Info'),
     )
- 
+
 
     code = models.CharField('Identifier', max_length=100, null=False, blank=False,
             help_text="Just a codename of the application, to be used in "\
@@ -92,11 +92,11 @@ class Application(models.Model):
     footer_top = models.TextField(default="", blank=True)
     footer_bottom = models.TextField(default="", blank=True)
 
-    message_type = models.CharField(max_length=20, 
+    message_type = models.CharField(max_length=20,
                                     choices= MESSAGE_TYPE_CHOICES,
                                     default = 'NM' )
     custom_message = models.TextField(default="", blank=True)
-    
+
     @classmethod
     def current(cls):
         return cls.objects.get(site__pk=settings.SITE_ID)
@@ -149,6 +149,7 @@ class ClientVersionSource(models.Model):
     source_type = models.CharField(max_length=60,
             choices=(('link','Link'),
                      ('direct','Direct'),
+                     ('pithos_xml','Pithos XML'),
                      ('redmine_files','Redmine files')))
     os = models.CharField(max_length=255)
     link = models.CharField(max_length=255)
@@ -179,8 +180,8 @@ class Service(models.Model, translations.TranslatedObjectMixin):
     image_faq = MediaFileForeignKey(MediaFile, blank=True, null=True, related_name='image_faq')
     image_userguide = MediaFileForeignKey(MediaFile, blank=True, null=True,related_name='image_userguide')
     class_name = models.CharField(_('class name'), max_length=100, blank=True)
-    
-    
+
+
     class Meta:
         verbose_name = _('service')
         verbose_name_plural = _('services')
@@ -193,13 +194,13 @@ class Service(models.Model, translations.TranslatedObjectMixin):
             return self.faqs.filter(is_active=True)[0]
         except:
             return None
-        
+
     def get_first_entry(self):
         try:
             return self.userguideentries.filter(is_active=True)[0]
         except:
             return None
-        
+
     def __unicode__(self):
         trans = translations.TranslatedObjectMixin.__unicode__(self)
         return trans or _('Unnamed category')
@@ -215,7 +216,7 @@ class ServiceTranslation(translations.Translation(Service)):
     cms_page = models.ForeignKey(Page, null=True, blank=True)
     title_faq = models.CharField(_('service title (faq section)'), max_length=100, blank=True)
     title_userguide = models.CharField(_('service title (userguide section)'), max_length=100, blank=True)
-    
+
     class Meta:
         verbose_name = _('service translation')
         verbose_name_plural = _('service translations')