From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 30 Dec 2013 23:14:31 +0000 (+0100)
Subject: Merge branch 'crem2' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0da5abe01e668ee46d828f00aaf71e3f02cf3f55;p=telemeta.git

Merge branch 'crem2' into diadems
---

0da5abe01e668ee46d828f00aaf71e3f02cf3f55
diff --cc telemeta/models/media.py
index 3e2b1942,2a7e27ca..18f5d30f
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -52,10 -52,12 +52,11 @@@ from telemeta.models.language import 
  from telemeta.models.format import *
  from telemeta.util.kdenlive.session import *
  from django.db import models
+ from django.conf import settings
  
  
 -# 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_published_code_regex   = '[A-Za-z0-9._-]*'
 +collection_unpublished_code_regex = '[A-Za-z0-9._-]*'
  collection_code_regex             = '(?:%s|%s)' % (collection_published_code_regex,
                                                      collection_unpublished_code_regex)