From b69bcc22cbfc4bb7ba85fd382d3bdd977e9b75df Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 6 Dec 2013 10:48:48 +0100 Subject: [PATCH] add '+' to code, try default grapher --- telemeta/models/media.py | 8 ++++---- telemeta/views/item.py | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 1d5087bf..c1acf38b 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -53,13 +53,13 @@ from telemeta.models.format import * from telemeta.util.kdenlive.session import * from django.db import models -collection_published_code_regex = '[A-Za-z0-9._-]*' -collection_unpublished_code_regex = '[A-Za-z0-9._-]*' +collection_published_code_regex = '[A-Za-z0-9._+-]*' +collection_unpublished_code_regex = '[A-Za-z0-9._+-]*' 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 = '[A-Za-z0-9._+-]*' +item_unpublished_code_regex = '[A-Za-z0-9._+-]*' item_code_regex = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex) PUBLIC_ACCESS_CHOICES = (('none', _('none')), ('metadata', _('metadata')), diff --git a/telemeta/views/item.py b/telemeta/views/item.py index fcfcc91f..f2e86243 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -117,10 +117,7 @@ class ItemView(object): if request.REQUEST.has_key('grapher_id'): grapher_id = request.REQUEST['grapher_id'] else: - try: - grapher_id = settings.TELEMETA_DEFAULT_GRAPHER_ID - except: - grapher_id = 'waveform' + grapher_id = getattr(settings, 'TELEMETA_DEFAULT_GRAPHER_ID', 'waveform') previous, next = self.item_previous_next(item) mime_type = self.item_analyze(item) -- 2.39.5