From 29dbcb0b0c3843c53f9911b9ecbd913a929ce133 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 20 May 2013 22:13:51 +0200 Subject: [PATCH] UNSTABLE : prepare various project branches merging, code regex go to settings --- telemeta/forms/media.py | 4 +--- telemeta/models/media.py | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py index 2d3e05da..a506f438 100644 --- a/telemeta/forms/media.py +++ b/telemeta/forms/media.py @@ -71,9 +71,7 @@ class MediaItemForm(ModelForm): class Meta: model = MediaItem - exclude = ('copied_from_item', 'scientist', 'topic', 'summary', 'contributor', - 'organization', 'depositor', 'rights', 'recordist', 'digitalist', - 'digitization_date', 'publishing_date', ) + exclude = ('copied_from_item',) def clean_code(self): return self.cleaned_data['code'] or None diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 3f1f973d..d9e07413 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -52,18 +52,28 @@ 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_code_regex = '(?:%s|%s)' % (collection_published_code_regex, - collection_unpublished_code_regex) - -# 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) +collection_published_code_regex = getattr(settings, 'COLLECTION_PUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*') +collection_unpublished_code_regex = getattr(settings, 'COLLECTION_UNPUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*') + +# CREM +#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 = getattr(settings, 'ITEM_PUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*') +item_unpublished_code_regex = getattr(settings, 'ITEM_UNPUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*') + +# CREM +# 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')), ('mixed', _('mixed')), ('full', _('full'))) -- 2.39.5