diff --git a/amadeus/settings.py b/amadeus/settings.py index 1e4cf4a..9d5153e 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -65,11 +65,12 @@ INSTALLED_APPS = [ 'topics', 'pendencies', 'file_link', + 'links', 'webpage', + 'youtube_video', 'mailsender', 'security', 'themes', - 'links' ] MIDDLEWARE_CLASSES = [ diff --git a/amadeus/urls.py b/amadeus/urls.py index 6c7f8ef..1e817ba 100644 --- a/amadeus/urls.py +++ b/amadeus/urls.py @@ -30,6 +30,7 @@ urlpatterns = [ url(r'^groups/', include('students_group.urls', namespace = 'groups')), url(r'^topics/', include('topics.urls', namespace = 'topics')), url(r'^webpages/', include('webpage.urls', namespace = 'webpages')), + url(r'^ytvideo/', include('youtube_video.urls', namespace = 'youtube')), url(r'^file_links/', include('file_link.urls', namespace = 'file_links')), url(r'^mailsender/', include('mailsender.urls', namespace = 'mailsender')), url(r'^security/', include('security.urls', namespace = 'security')), diff --git a/categories/migrations/0011_auto_20170201_1732.py b/categories/migrations/0011_auto_20170201_1732.py new file mode 100644 index 0000000..9db8f93 --- /dev/null +++ b/categories/migrations/0011_auto_20170201_1732.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-02-01 20:32 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('categories', '0010_auto_20170201_0013'), + ] + + operations = [ + migrations.AlterField( + model_name='category', + name='coordinators', + field=models.ManyToManyField(blank=True, related_name='Coordenadores', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/topics/templates/topics/list.html b/topics/templates/topics/list.html index 11f5d3b..54b091d 100644 --- a/topics/templates/topics/list.html +++ b/topics/templates/topics/list.html @@ -52,7 +52,7 @@ {% trans 'Add Resource' %}