From: yomguy <yomguy@parisson.com>
Date: Fri, 18 Nov 2011 12:16:22 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~31
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=71026ba7787c77af5b7555741cacd15373b0b5b8;p=telemeta.git

Merge branch 'master' into crem
---

71026ba7787c77af5b7555741cacd15373b0b5b8
diff --cc telemeta/models/media.py
index 43730895,83b223ec..70a8a09b
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -217,10 -217,12 +217,12 @@@ class MediaCollection(MediaResource)
  class MediaCollectionForm(ModelForm):
      class Meta:
          model = MediaCollection
+     def clean_doctype_code(self):
+         return self.cleaned_data['doctype_code'] or 0
          
  
 -item_published_code_regex    = '[A-Za-z0-9._-]*'
 -item_unpublished_code_regex  = '[A-Za-z0-9._-]*'
 +item_published_code_regex    = collection_published_code_regex + '(?:_[0-9]{2,3}){1,2}'
 +item_unpublished_code_regex  = collection_unpublished_code_regex + '_[0-9]{2,3}(?:_[0-9]{2,3}){0,2}'
  item_code_regex              = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex)
  
  class MediaItem(MediaResource):