no video download, fix course order

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index e29a721d47a6394ff105de16770bb0c6ad88d988..b291e511950f5d8e7992b6e233d9102a4b35a712 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -57,7 +57,7 @@ $(document).ready(function(){
 {% endblock extra_javascript %}
 
 {% block module-action %}
-{% if media.item.file and media.is_published %}
+{% if media.item.file and media.is_published and not "video" in media.mime_type %}
 <div class="module_action">
 <a href="{{ MEDIA_URL }}{{ media.item.file }}" class="component_icon button" id="action_red"><img src="{{STATIC_URL}}teleforma/images/download_media.png" alt="" style="vertical-align:middle" />&nbsp;{% trans "Download" %}</a>
 </div>
@@ -160,4 +160,4 @@ $(document).ready(function(){
 {% include "teleforma/inc/chat_room.html" %}
 {% endwith %}
 {% endif %}
-{% endblock chat %}
\ No newline at end of file
+{% endblock chat %}

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index d4fda2c17938d4d4ee9de7441894a32725dd6698..1c224394e8061494e600949e1bbe1b77e101648f 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -102,11 +102,11 @@ def format_courses(courses, course=None, queryset=None, types=None):
 def get_courses(user, date_order=False, num_order=False):
     if settings.TELEFORMA_E_LEARNING_TYPE == 'CRFPA':
         from teleforma.views.crfpa import get_crfpa_courses
-        return get_crfpa_courses(user, date_order=False, num_order=False)
+        return get_crfpa_courses(user, date_order, num_order)
 
     elif settings.TELEFORMA_E_LEARNING_TYPE == 'AE':
         from teleforma.views.ae import get_ae_courses
-        return get_ae_courses(user, date_order=False, num_order=False)
+        return get_ae_courses(user, date_order, num_order)
 
 
 def stream_from_file(__file):