Fix admin various errors

diff --git a/teleforma/exam/admin.py b/teleforma/exam/admin.py
index d2759f4e24a4bb7f6330614b8112f753b41cdca5..96295c169762a05384af18abc8f67eac6fa9f819 100644 (file)
--- 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 f181e0d444711c13808e210517992a032c70823a..29aa881ef141410ebe15e1bb841ea0cd56b3e696 100755 (executable)
--- 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 72903c8319999fd27db1320641332c66985d0296..649574a44d48c3f61e5453b0d7a945b9a99cfaeb 100644 (file)
--- 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 17501b465980dfa572f4732c89a6f63fde50ac11..7c88709f0ace34ac2e1dd2613123c011ac69e534 100644 (file)
--- 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 8ab79a59a3aa54c5a813f1f909ba52e223501f29..378acf7f021d135c0a1aa6e32725489fcd61c8fb 100644 (file)
--- 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 35d7b5a3036f58addc47124c45d5d2fbce07fdec..8fe9132be27d0decfabbca877ca172c144480244 100644 (file)
--- 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()