From: yomguy <yomguy@parisson.com>
Date: Tue, 29 Nov 2011 09:03:52 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~19
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=244d0687c23faf647b27a9c0a4664c8fdd76519c;p=telemeta.git

Merge branch 'master' into crem
---

244d0687c23faf647b27a9c0a4664c8fdd76519c
diff --cc telemeta/models/media.py
index cb64851e,5c272d92..1548b4de
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -57,10 -57,11 +57,11 @@@ collection_unpublished_code_regex = 'CN
  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._-]*'
 +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'))
  
  class MediaResource(ModelCore):
      "Base class of all media objects"