Changeset aef89d3 for telemeta/models/media.py

Timestamp:

02/06/12 22:59:57 (16 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test

Children:

e51c2f2

Parents:

a205ec9 (diff), ecd7964 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (02/06/12 22:59:57)

git-committer:

yomguy <yomguy@…> (02/06/12 22:59:57)

Message:

Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta

Conflicts:

telemeta/templates/telemeta_default/base.html

File:

• telemeta/models/media.py (modified) (1 diff)

telemeta/models/media.py

@@ -52 +52 @@
 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)