prepare better filtering

diff --git a/teleforma/admin.py b/teleforma/admin.py
index 46c589a2f290da6f8c757c55c99f12eae598c35d..6659a0b21b69fc021eb48539d8b74de73906f6bc 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -42,11 +42,14 @@ class DocumentAdmin(admin.ModelAdmin):
 class MediaAdmin(admin.ModelAdmin):
     exclude = ['readers']
 
+class ConferenceAdmin(admin.ModelAdmin):
+    exclude = ['readers']
+
 admin.site.register(Organization)
 admin.site.register(Department)
 admin.site.register(Period)
 admin.site.register(Course, CourseAdmin)
-admin.site.register(Conference)
+admin.site.register(Conference, ConferenceAdmin)
 admin.site.register(IEJ)
 admin.site.register(Document, DocumentAdmin)
 admin.site.register(DocumentType)

diff --git a/teleforma/models.py b/teleforma/models.py
index 9b4d43541ba1ac60c1777927805ac93e20aa04af..03fb191f161f8af0b367bad30faf95f76a37c323 100755 (executable)
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -292,6 +292,7 @@ class DocumentType(Model):
 
     name            = CharField(_('name'), max_length=255)
     description     = CharField(_('description'), max_length=255, blank=True)
+    number          = IntegerField(_('number'), blank=True, null=True)
 
     def __unicode__(self):
         return self.name
@@ -299,6 +300,7 @@ class DocumentType(Model):
     class Meta:
         db_table = app_label + '_' + 'document_type'
         verbose_name = _('document type')
+        ordering = ['number']
 
 
 class Document(MediaBase):

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 83d5048d133760e4596272c26d3ed6ebd6f0a935..63401f03b3a23a8051b20ea396aa0ff530a4f372 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -17,12 +17,14 @@
     </thead>
     <tbody>
         {% for media in course.media.all|from_type:type %}
+         {% if media.published or user.is_staff %}
             <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
             <td><a href="{% url teleforma-media-detail media.id %}">{{ media.conference.session }}</a></td>
-            <td><a href="{% url teleforma-profile-detail media.conference.professor.user.username %}" target="_blank">{{ media.conference.professor }}</a></td>
-            <td><a href="{% url teleforma-media-detail media.id %}">{{ media.conference.date_begin }}</a></td>
+            <td>{% if media.conference %}<a href="{% url teleforma-profile-detail media.conference.professor.user.username %}" target="_blank">{{ media.conference.professor }}</a>{% endif %}</td>
+            <td>{% if media.conference.date_begin %}<a href="{% url teleforma-media-detail media.id %}">{{ media.conference.date_begin }}</a>{% endif %}</td>
             <td>{{ media.item.approx_duration }}</td>
             </tr>
+         {% endif %}
         {% endfor %}
     </tbody>
     </table>

diff --git a/teleforma/views.py b/teleforma/views.py
index 1baa8476e955ee752d280cf9698b6923707af7e2..059d0a84e1b5af6d3b96dc9e36a76f337ba83bb2 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -88,9 +88,13 @@ def get_courses(user):
             courses.append({'courses': c, 'types': t})
 
     elif user.is_staff:
-        courses = [{'courses': Course.objects.all().order_by('number'),
+        courses = [{'courses': Course.objects.all(),
                     'types': CourseType.objects.all()},
                    ]
+        course_menu = [{'courses': courses[0]['courses'].order_by('number'),
+                        'types': courses[0]['types']},
+                      ]
+        print course_menu
     else:
         courses = None
     return courses