Merge branch 'master' into crem

Conflicts:
	telemeta/models/media.py

diff --cc telemeta/models/media.py
index 90a444de6f54de74be64a9b22e88fe777cec01f3,466889a791d22ecc2c1770acf7d768ca24b1a5e8..b55725e9f7b8d1d537a97d84b8b8c0d4e7040158
--- 1/telemeta/models/media.py
--- 2/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -75,8 -75,41 +75,42 @@@ class MediaResource(ModelCore)
          abstract = True
  
  
 -collection_published_code_regex   = '[A-Za-z0-9._-]*'
 -collection_unpublished_code_regex = '[A-Za-z0-9._-]*'
+ class MediaCorpus(MediaResource):
+     "Describe a corpus of collections"
+     
+     element_type = 'corpus'
+     PUBLIC_ACCESS_CHOICES = (('none', 'none'), ('metadata', 'metadata'), ('full', 'full'))
+ 
+     # General informations
+     reference             = CharField(_('reference'), unique=True, null=True)
+     title                 = CharField(_('title'), required=True)
+     description           = CharField(_('description'))
+     code                  = CharField(_('code'), unique=True, required=True)
+     public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, 
+                                       max_length=16, default="metadata")
+                                       
+     def __unicode__(self):
+         return self.code
+ 
+     @property
+     def public_id(self):
+         return self.code
+ 
+     def save(self, force_insert=False, force_update=False, user=None, code=None):
+         super(MediaCorpus, self).save(force_insert, force_update)
+         
+     class Meta(MetaCore):
+         db_table = 'media_corpus'
+         ordering = ['code']
+     
+ class MediaCorpusForm(ModelForm):
+     class Meta:
+         model = MediaCorpus
+         
+         
++
 +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)