Ignore:
Timestamp:
Feb 6, 2012 10:59:57 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, production, release/1.4.4, sabiod, security, server, social, storage, telecaster, 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@…> (06/02/2012 22:59:57)
git-committer:
yomguy <yomguy@…> (06/02/2012 22:59:57)
Message:

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

Conflicts:

telemeta/templates/telemeta_default/base.html

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    r25d44c7 raef89d3  
    5252from django.db import models 
    5353 
    54 collection_published_code_regex   = '[A-Za-z0-9._-]*' 
    55 collection_unpublished_code_regex = '[A-Za-z0-9._-]*' 
     54 
     55# Special code regex of collections for the branch 
     56collection_published_code_regex   = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}' 
     57collection_unpublished_code_regex = 'CNRSMH_I_[0-9]{4}_[0-9]{3}' 
    5658collection_code_regex             = '(?:%s|%s)' % (collection_published_code_regex, 
    5759                                                    collection_unpublished_code_regex) 
    5860 
    59 item_published_code_regex    = '[A-Za-z0-9._-]*' 
    60 item_unpublished_code_regex  = '[A-Za-z0-9._-]*' 
     61# Special code regex of items for the branch 
     62item_published_code_regex    = collection_published_code_regex + '(?:_[0-9]{2,3}){1,2}' 
     63item_unpublished_code_regex  = collection_unpublished_code_regex + '_[0-9]{2,3}(?:_[0-9]{2,3}){0,2}' 
    6164item_code_regex              = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex) 
    6265 
Note: See TracChangeset for help on using the changeset viewer.