Merge 'develop' into 'feature/work/backend'
This commit is contained in:
@@ -172,3 +172,8 @@ LOGGING = {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ZENDESK_ROLES = {
|
||||
'engineer': 360005209000,
|
||||
'light_agent': 360005208980,
|
||||
}
|
||||
|
||||
@@ -17,13 +17,9 @@ from django.contrib import admin
|
||||
from django.contrib.auth.views import LoginView
|
||||
from django.contrib.auth import views as auth_views
|
||||
from django.urls import path, include
|
||||
|
||||
|
||||
from access_controller import settings
|
||||
from access_controller.settings import DEBUG
|
||||
from main.views import main_page, profile_page, CustomRegistrationView, work_page, work_hand_over, work_become_engineer
|
||||
|
||||
from main.views import main_page, profile_page, CustomRegistrationView
|
||||
from main.views import main_page, profile_page, CustomRegistrationView, work_page, work_hand_over, work_become_engineer, AdminPageView
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
@@ -39,6 +35,7 @@ urlpatterns = [
|
||||
path('work/become_engineer/', work_become_engineer, name="work_become_engineer"),
|
||||
path('accounts/', include('django_registration.backends.activation.urls')),
|
||||
path('accounts/login/', include('django.contrib.auth.urls')),
|
||||
path('control/', AdminPageView.as_view(), name='control')
|
||||
]
|
||||
|
||||
urlpatterns += [
|
||||
|
||||
Reference in New Issue
Block a user