Commit f4df64fb authored by Emmanuel Linus T. Evangelista's avatar Emmanuel Linus T. Evangelista

Merge branch 'tan/assignments' of...

Merge branch 'tan/assignments' of https://gitlab.discs.ateneo.edu/totallynotkai/widgets-fekk into tan/assignments
parents 7ee7d3ad d6cb7c22
...@@ -5,7 +5,6 @@ from .views import MainView, AssignmentListView, AssignmentDetailView ...@@ -5,7 +5,6 @@ from .views import MainView, AssignmentListView, AssignmentDetailView
urlpatterns = [ urlpatterns = [
path('', MainView.as_view(), name='assignments'), path('', MainView.as_view(), name='assignments'),
path('assignments', AssignmentListView.as_view(), name='assignment-list'), path('assignments', AssignmentListView.as_view(), name='assignment-list'),
path('/<int:pk>/details', AssignmentDetailView.as_view(), name ='assignment-detail'),
] ]
app_name = 'Assignments' app_name = 'Assignments'
\ No newline at end of file
...@@ -17,6 +17,7 @@ from django.contrib import admin ...@@ -17,6 +17,7 @@ from django.contrib import admin
from django.urls import path, include from django.urls import path, include
import Announcements.views as Announcements_views import Announcements.views as Announcements_views
import Forum.views as Forum_views import Forum.views as Forum_views
from Assignments.views import AssignmentDetailView
urlpatterns = [ urlpatterns = [
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
...@@ -26,4 +27,7 @@ urlpatterns = [ ...@@ -26,4 +27,7 @@ urlpatterns = [
path('announcements/', include('Announcements.urls', namespace="Announcements")), path('announcements/', include('Announcements.urls', namespace="Announcements")),
path('announcements/<int:announcement_id>/details', Announcements_views.details, name='announcement_details'), path('announcements/<int:announcement_id>/details', Announcements_views.details, name='announcement_details'),
path('assignments/', include('Assignments.urls', namespace="Assignments")), path('assignments/', include('Assignments.urls', namespace="Assignments")),
path('assignment/<int:pk>/details', AssignmentDetailView.as_view(), name ='assignment-detail'),
] ]
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