diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py index 8c1d319531..1c0cc7cefe 100644 --- a/InvenTree/InvenTree/urls.py +++ b/InvenTree/InvenTree/urls.py @@ -1,5 +1,6 @@ from django.conf.urls import url, include from django.contrib import admin +from django.contrib.auth import views as auth_views from company.urls import company_urls @@ -34,9 +35,6 @@ apipatterns = [ ] urlpatterns = [ - - url(r'^api-doc/', include_docs_urls(title='InvenTree API')), - url(r'^part/', include(part_urls)), url(r'^supplier-part/', include(supplier_part_urls)), @@ -46,11 +44,14 @@ urlpatterns = [ url(r'^build/', include(build_urls)), - url(r'^admin/', admin.site.urls), - url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), + url(r'^login/', auth_views.login, name='login'), + url(r'^logout/', auth_views.logout, name='logout'), + url(r'^admin/', admin.site.urls), + url(r'^api/', include(apipatterns)), + url(r'^api-doc/', include_docs_urls(title='InvenTree API')), ] # Static file access diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html index 5b172f1b5e..84c86390c7 100644 --- a/InvenTree/part/templates/part/category.html +++ b/InvenTree/part/templates/part/category.html @@ -50,7 +50,7 @@ {% endblock %} {% block js_load %} {{ block.super }} - + {% endblock %} {% block js_ready %} {{ block.super }} diff --git a/InvenTree/templates/registration/login.html b/InvenTree/templates/registration/login.html new file mode 100644 index 0000000000..bb56433e74 --- /dev/null +++ b/InvenTree/templates/registration/login.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} + +{% block content %} +
You have been logged out
+Click here to log in
+{% endblock %} \ No newline at end of file