From: yomguy <yomguy@parisson.com>
Date: Tue, 13 Dec 2011 14:36:02 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ecd79645f22e25895a689c81c1dd2ab818d6ea17;p=telemeta.git

Merge branch 'master' into crem

Conflicts:
	telemeta/models/media.py
---

ecd79645f22e25895a689c81c1dd2ab818d6ea17
diff --cc telemeta/models/media.py
index 5788bde0,52ba0cc6..58d96a1d
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -48,15 -48,16 +48,19 @@@ from telemeta.models.system import Revi
  from telemeta.models.query import *
  from telemeta.models.instrument import *
  from telemeta.models.enum import *
- from django.db.models.fields import URLField
+ from telemeta.models.language 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)
  
 -item_published_code_regex    = '[A-Za-z0-9._-]*'
 -item_unpublished_code_regex  = '[A-Za-z0-9._-]*'
++# Special code regex of items for the branch
 +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)
  
  PUBLIC_ACCESS_CHOICES = (('none', 'none'), ('metadata', 'metadata'), ('full', 'full'))