From 48945a49662eda0de85d977b59ecf03ebac162e1 Mon Sep 17 00:00:00 2001
From: test test <yoanl@pilotsystems.net>
Date: Thu, 27 May 2021 14:54:07 +0200
Subject: [PATCH] Fix admin various errors

---
 teleforma/exam/admin.py                 | 5 ++++-
 teleforma/models/core.py                | 4 ++--
 teleforma/models/messages.py            | 2 +-
 teleforma/templates/teleforma/base.html | 2 +-
 teleforma/templates/telemeta/base.html  | 2 +-
 teleforma/webclass/views.py             | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/teleforma/exam/admin.py b/teleforma/exam/admin.py
index d2759f4e..96295c16 100644
--- a/teleforma/exam/admin.py
+++ b/teleforma/exam/admin.py
@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
-from ..exam.models import Quota, Script, ScriptPage, ScriptType
+import os
+
 from django.contrib import admin
 from django.template.defaultfilters import filesizeformat
 
+from ..exam.models import Quota, Script, ScriptPage, ScriptType
+
 
 class QuotaAdmin(admin.ModelAdmin):
     model= Quota
diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index f181e0d4..29aa881e 100755
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -394,7 +394,7 @@ class Conference(models.Model):
 
     @property
     def description(self):
-        return self.__unicode__()
+        return str(self)
 
     @property
     def slug(self):
@@ -773,7 +773,7 @@ class MediaTranscoded(models.Model):
         if self.item.title:
             return self.item.title + ' - ' + self.mime_type
         else:
-            return self.item.public_id + ' - ' + self.mime_type
+            return str(self.item.id) + ' - ' + self.mime_type
 
     class Meta(MetaCore):
         db_table = app_label + '_media_transcoded'
diff --git a/teleforma/models/messages.py b/teleforma/models/messages.py
index 72903c83..649574a4 100644
--- a/teleforma/models/messages.py
+++ b/teleforma/models/messages.py
@@ -47,7 +47,7 @@ class GroupedMessage(models.Model):
         verbose_name = _('Grouped message')
 
     def __str__(self):
-        return self.group.name + ' ' + self.subject
+        return self.group and self.group.name + ' ' + self.subject or self.subject
 
     def save(self, *args, **kwargs):
         if self.to_send:
diff --git a/teleforma/templates/teleforma/base.html b/teleforma/templates/teleforma/base.html
index 17501b46..7c88709f 100644
--- a/teleforma/templates/teleforma/base.html
+++ b/teleforma/templates/teleforma/base.html
@@ -153,7 +153,7 @@
 
           {% if user.is_authenticated %}
           {% if user.is_superuser %}
-          <li><a href="/admin/django/" target="_blank" class="blue">{% trans "Admin" %}</a></li>
+          <li><a href="/admin/" target="_blank" class="blue">{% trans "Admin" %}</a></li>
           {% else %}
           <li><a href="{% url 'teleforma-help' %}" class="blue">{% trans "Help" %}</a></li>
           {% endif %}
diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 8ab79a59..378acf7f 100644
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -149,7 +149,7 @@ alt="logo" />
 
  {% if user.is_authenticated %}
   {% if user.is_superuser %}
-  <li><a href="/admin/django/" target="_blank" class="blue">{% trans "Admin" %}</a></li>
+  <li><a href="/admin/" target="_blank" class="blue">{% trans "Admin" %}</a></li>
   {% else %}
    <li><a href="{% url 'teleforma-help' %}" class="blue">{% trans "Help" %}</a></li>
  {% endif %}
diff --git a/teleforma/webclass/views.py b/teleforma/webclass/views.py
index 35d7b5a3..8fe9132b 100644
--- a/teleforma/webclass/views.py
+++ b/teleforma/webclass/views.py
@@ -158,7 +158,7 @@ class WebclassRecordView(TemplateView):
 class WebclassRecordsFormView(FormView):
     template_name = 'webclass/records_form.html'
     form_class = WebclassRecordsForm
-    success_url = '/admin/django/webclass/webclassrecord'
+    success_url = '/admin/webclass/webclassrecord'
 
     def get_form_kwargs(self):
         kwargs = super(WebclassRecordsFormView, self).get_form_kwargs()
-- 
2.39.5