From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 19 Dec 2013 10:13:35 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~31
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=915a58c309c1b99f53ef54fef18449a1132205c0;p=telemeta.git

Merge branch 'dev' into crem2

Conflicts:
	telemeta/models/media.py
---

915a58c309c1b99f53ef54fef18449a1132205c0
diff --cc example/sandbox/settings.py
index fe913c79,ddaf6e0a..f50a60fc
--- a/example/sandbox/settings.py
+++ b/example/sandbox/settings.py
@@@ -161,5 -162,3 +162,5 @@@ LOGIN_REDIRECT_URL = reverse_lazy('tele
  
  EMAIL_HOST = 'localhost'
  DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
 +
- FILE_UPLOAD_TEMP_DIR = '/tmp'
++FILE_UPLOAD_TEMP_DIR = '/tmp'
diff --cc telemeta/models/media.py
index fa195645,811d60be..9cc9aa62
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -216,10 -209,9 +215,10 @@@ class MediaCollection(MediaResource)
      publisher_serial      = CharField(_('publisher serial number'))
      booklet_author        = CharField(_('author of published notice'))
      external_references   = TextField(_('bibliographic references'))
-     doctype_code          = IntegerField(_('document type'))
-     public_access         = CharField(_('access status'), choices=PUBLIC_ACCESS_CHOICES,
+     doctype_code          = IntegerField(_('document type'), null=True, blank=True)
+     public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES,
                                        max_length=16, default="metadata")
 +    auto_period_access    = BooleanField(_('automatic access after a rolling period'), default=True)
      legal_rights          = WeakForeignKey('LegalRight', related_name="collections",
                                             verbose_name=_('legal rights'))