Commit c849fa61 authored by Martin Lehoux's avatar Martin Lehoux

Merge branch 'dev' into 'master'

Dev

See merge request !39
parents eee2766c cc0727e4
......@@ -17,7 +17,7 @@ def find_or_create_user(access_token, access_token_payload):
first_name=data['firstName'],
last_name=data['lastName'],
promo=data['promo'],
photoPath="https://auth.viarezo.fr/media/"+data['photo']
photoPath="https://auth.viarezo.fr/media/"+str(data['photo'])
)
user.save()
if "ViaRézo(wo)man" in data['roles']:
......
......@@ -10,8 +10,8 @@
<span id="stars">{{ document.like_list|length }}</span>
</div>
</div>
<button id="like" class="ui green right floated icon button"> <i class="thumbs up icon"></i></a>
<button id="dislike" class="ui red right floated icon button"> <i class="thumbs down icon"></i></a>
<button id="like" class="ui green right floated icon button"> <i class="thumbs up icon"></i></button>
<button id="dislike" class="ui red right floated icon button"> <i class="thumbs down icon"></i></button>
<button id="load" class="ui loading right floated button">.</button>
</div>
{% if document.course.pk != Null %}<div class="meta"><a href="{% url 'core:get_course' document.course.pk %}">{{document.course}}</a></div>{% endif %}
......@@ -78,4 +78,4 @@
}
});
})
</script>
\ No newline at end of file
</script>
......@@ -29,7 +29,7 @@ urlpatterns = [
path('post_course_comment/<int:course_id>', views.post_course_comment, name='post_course_comment'),
# Need a more global redirect to home
# Download
path('dowload_document/<int:document_id>', views.download_document, name='download_document'),
path('download_document/<int:document_id>', views.download_document, name='download_document'),
path('download_correction/<int:document_id>', views.download_correction, name="download_correction"),
# Error
path('error', views.error, name='error'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment