From: yomguy <yomguy@parisson.com>
Date: Wed, 2 May 2012 13:34:03 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~24^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cd5ae3a84886fdcd5c4d0e54de4e0e2a5b3a8f9f;p=telemeta.git

Merge branch 'master' into crem
---

cd5ae3a84886fdcd5c4d0e54de4e0e2a5b3a8f9f
diff --cc telemeta/models/media.py
index 32b532ce,480247ec..499eadb7
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -49,12 -49,11 +49,13 @@@ from telemeta.models.query import 
  from telemeta.models.instrument import *
  from telemeta.models.enum import *
  from telemeta.models.language import *
+ from telemeta.models.format import *
  from django.db import models
  
 -collection_published_code_regex   = '[A-Za-z0-9._-]*'
 -collection_unpublished_code_regex = '[A-Za-z0-9._-]*'
 +
 +# Special code regex of collections for the branch
 +collection_published_code_regex   = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}'
 +collection_unpublished_code_regex = 'CNRSMH_I_[0-9]{4}_[0-9]{3}'
  collection_code_regex             = '(?:%s|%s)' % (collection_published_code_regex,
                                                      collection_unpublished_code_regex)