From ae94249ef07031690e511f3c3f78b9699c8ce372 Mon Sep 17 00:00:00 2001 From: Cezary Czaplewski Date: Wed, 8 Nov 2017 23:58:21 +0100 Subject: [PATCH 1/1] django-lazysignup --- .../templates/registration/login.html | 23 ++++++++++++++++++++ django_simple/settings.py | 6 +++++ django_simple/todo/views.py | 9 +++++--- django_simple/urls.py | 1 + 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/django_simple/authentication/templates/registration/login.html b/django_simple/authentication/templates/registration/login.html index 9b24598..a222731 100644 --- a/django_simple/authentication/templates/registration/login.html +++ b/django_simple/authentication/templates/registration/login.html @@ -2,6 +2,29 @@ {% load i18n %} {% block content %} + +Run jobs without login. + +
  • +
    + {% csrf_token %} +
    +
    +
    + +
    +
    + +
    +
    +
  • + + +
    +Register and login to save your jobs. +
    {% csrf_token %} {{ form.as_p }} diff --git a/django_simple/settings.py b/django_simple/settings.py index 1d17fda..f594aad 100644 --- a/django_simple/settings.py +++ b/django_simple/settings.py @@ -43,6 +43,7 @@ INSTALLED_APPS = [ 'django_simple.todo', 'django_simple.directory', 'registration', + 'lazysignup', ] MIDDLEWARE_CLASSES = [ @@ -56,6 +57,11 @@ MIDDLEWARE_CLASSES = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] +AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.ModelBackend', + 'lazysignup.backends.LazySignupBackend', + ) + ROOT_URLCONF = 'django_simple.urls' TEMPLATES = [ diff --git a/django_simple/todo/views.py b/django_simple/todo/views.py index 9822a30..f338be2 100644 --- a/django_simple/todo/views.py +++ b/django_simple/todo/views.py @@ -7,6 +7,7 @@ import datetime import os import subprocess import json +from lazysignup.decorators import allow_lazy_user res_codes = [ # 20 canonical amino acids @@ -106,7 +107,7 @@ def index(request): 'tasks': tasks }) -@login_required +@allow_lazy_user def add(request): if request.method == 'POST': form = TaskForm(request.POST) @@ -118,7 +119,6 @@ def add(request): return redirect('add_min',task_id=task.id) return redirect('/') - @login_required def add_min(request,task_id): task = get_object_or_404(Task, id=task_id) @@ -148,6 +148,7 @@ def add_min(request,task_id): basic_adv=True return render(request, 'edit.html', {'form': form, 'task':task, 'basic_adv':basic_adv, 'p_type':p_type}) +@login_required def add_min_a(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': @@ -227,6 +228,7 @@ def add_md(request,task_id): p_type='molecular dynamics' return render(request, 'edit.html', {'form': form, 'task':task, 'basic_adv':basic_adv, 'p_type':p_type}) +@login_required def add_md_a(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': @@ -321,6 +323,7 @@ def add_remd(request,task_id): p_type='replica exchange molecular dynamics' return render(request, 'edit.html', {'form': form, 'task':task, 'basic_adv':basic_adv, 'p_type':p_type}) +@login_required def add_remd_a(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': @@ -373,7 +376,7 @@ def add_remd_a(request,task_id): p_type='replica exchange molecular dynamics - advanced options' return render(request, 'edit.html', {'form': form, 'task':task, 'basic_adv':basic_adv, 'p_type':p_type}) - +@login_required def addmlist(request,task_id): task = get_object_or_404(Task, id=task_id) if request.method == 'POST': diff --git a/django_simple/urls.py b/django_simple/urls.py index c0c5f34..d764184 100644 --- a/django_simple/urls.py +++ b/django_simple/urls.py @@ -12,4 +12,5 @@ urlpatterns = [ url(r'^myfiles/', include(directory_urls)), url(r'^admin/', include(admin.site.urls)), url(r'^accounts/', include('registration.backends.hmac.urls')), + url(r'^convert/', include('lazysignup.urls')), ] -- 1.7.9.5