Minor fixes

diff --git a/app/local_settings.py b/app/local_settings.py
index c1cec304e777a614e42109f9b7e109e19aa2717a..900c27e9c749e796552f24e9da54cf9ace8fb2e7 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -72,10 +72,9 @@ SILENCED_SYSTEM_CHECKS = ['fields.W342',]
 ADMIN_MENU_ORDER = (
     (_('Pages'), ('pages.Page', 'organization-pages.Home',
                  'organization-core.LinkType')),
-    (_('Media'), ('organization-media.Video',
+    (_('Media'), ('organization-media.Media',
+                  'organization-media.Playlist',
                  'organization-media.MediaCategory',
-                 'organization-media.Audio',
-                 'organization-media.Playlist',
                  (_('Media Library'), 'fb_browse'),
                  )),
     (_('Events'), ('mezzanine_agenda.Event',

diff --git a/app/organization/media/models.py b/app/organization/media/models.py
index 8fd66b3a5f633c355978135d08115c0a15a7e3d0..234a93502dc523c47895eb2ab8706f780c641cc5 100644 (file)
--- a/app/organization/media/models.py
+++ b/app/organization/media/models.py
@@ -79,7 +79,7 @@ models.signals.post_save.connect(create_media, sender=Media, dispatch_uid='creat
 class MediaTranscoded(models.Model):
 
     media = models.ForeignKey('Media', verbose_name=_('media'), related_name='transcoded')
-    file = FileField(_("Image"), max_length=1024, upload_to="uploads/media/")
+    file = FileField(_("file"), max_length=1024, upload_to="uploads/media/")
     url = models.URLField(_('URL'), max_length=1024, blank=True)
     mime_type = models.CharField(_('mime type'), max_length=64)