arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-22 07:52:15 +00:00
Code Issues Projects Releases Wiki Activity

Better fix for previous commit

Browse Source
This commit is contained in:
FreneticScribbler
2020-03-07 15:32:40 +00:00
parent 739913a2c9
commit 7773bf96c8
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RIGS/urls.py
View File

@@ -3,6 +3,7 @@ from django.conf.urls import url
from django.contrib.auth.views import PasswordResetView from django.contrib.auth.views import PasswordResetView
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.contrib.auth.views import LoginView
from RIGS import models, views, rigboard, finance, ical, versioning, forms from RIGS import models, views, rigboard, finance, ical, versioning, forms
from django.views.generic import RedirectView from django.views.generic import RedirectView
from django.views.decorators.clickjacking import xframe_options_exempt from django.views.decorators.clickjacking import xframe_options_exempt
@@ -17,7 +18,7 @@ urlpatterns = [
url('^$', login_required(views.Index.as_view()), name='index'), url('^$', login_required(views.Index.as_view()), name='index'),
url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'), url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'),
path('user/login/', views.login, name='login'), path('user/login/', LoginView.as_view(authentication_form=forms.CheckApprovedForm), name='login'),
path('user/login/embed/', xframe_options_exempt(views.LoginEmbed.as_view()), name='login_embed'), path('user/login/embed/', xframe_options_exempt(views.LoginEmbed.as_view()), name='login_embed'),
url(r'^search_help/$', views.SearchHelp.as_view(), name='search_help'), url(r'^search_help/$', views.SearchHelp.as_view(), name='search_help'),

10
RIGS/views.py
View File

@@ -34,16 +34,6 @@ class Index(generic.TemplateView):
context['rig_count'] = models.Event.objects.rig_count() context['rig_count'] = models.Event.objects.rig_count()
return context return context
# TODO: CBV?
def login(request, **kwargs):
if request.user.is_authenticated:
next = request.GET.get('next', '/')
return HttpResponseRedirect(next)
else:
from django.contrib.auth.views import login
return login(request, authentication_form=forms.CheckApprovedForm)
class SearchHelp(generic.TemplateView): class SearchHelp(generic.TemplateView):
template_name = 'RIGS/search_help.html' template_name = 'RIGS/search_help.html'