From 4091e25ee167cef7079b1c642f4e7a702af16734 Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Mon, 2 Sep 2019 00:01:39 +0200 Subject: [PATCH] Pridana stranka uzivatele a dummy views MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dummy views - reset hesla, změna údajů Absolutni URL prevedeny na reverse lookup. --- seminar/templates/seminar/login.html | 6 +++--- seminar/templates/seminar/prihlaska.html | 2 +- seminar/templates/seminar/resitel.html | 17 +++++++++++++++++ seminar/urls.py | 9 ++++++--- seminar/views.py | 14 ++++++++++++++ 5 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 seminar/templates/seminar/resitel.html diff --git a/seminar/templates/seminar/login.html b/seminar/templates/seminar/login.html index dbed7a17..88cd364f 100644 --- a/seminar/templates/seminar/login.html +++ b/seminar/templates/seminar/login.html @@ -11,7 +11,7 @@ {% if login_error %} {{login_error}} {% endif %} -
+ {% csrf_token %} {{form.non_field_errors}}
    @@ -25,8 +25,8 @@ -Zapomněl jsem heslo
    -Zaregistrovat
    +Zapomněl jsem heslo
    +Zaregistrovat
    {% endblock %} diff --git a/seminar/templates/seminar/prihlaska.html b/seminar/templates/seminar/prihlaska.html index c77bd4fc..8b17c0bd 100644 --- a/seminar/templates/seminar/prihlaska.html +++ b/seminar/templates/seminar/prihlaska.html @@ -15,7 +15,7 @@ -
    + {% csrf_token %} {{form.non_field_errors}}
      diff --git a/seminar/templates/seminar/resitel.html b/seminar/templates/seminar/resitel.html new file mode 100644 index 00000000..3a38a085 --- /dev/null +++ b/seminar/templates/seminar/resitel.html @@ -0,0 +1,17 @@ +{% extends "seminar/zadani/base.html" %} +{% load staticfiles %} + + +{% block content %} +

      + {% block nadpis1a %}{% block nadpis1b %} + Stránka řešitele - {{ object.osoba.jmeno }} {{ object.osoba.prijmeni }} + {% endblock %}{% endblock %} +

      + +Odhlásit se
      +Upravit údaje
      + + +{% endblock %} + diff --git a/seminar/urls.py b/seminar/urls.py index b7e39f47..c37d1357 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -98,10 +98,13 @@ urlpatterns = [ staff_member_required(views.texUploadView), name='seminar_tex_upload' ), - path('prihlaska/',views.prihlaskaView, name='seminar_prihlaska'), - path('login/', views.loginView, name='login'), - path('logout/', views.logoutView, name='logout'), + path('auth/prihlaska/',views.prihlaskaView, name='seminar_prihlaska'), + path('auth/login/', views.loginView, name='login'), + path('auth/logout/', views.logoutView, name='logout'), + path('auth/resitel/', views.ResitelView.as_view(), name='seminar_resitel'), path('autocomplete/skola/',views.SkolaAutocomplete.as_view(), name='autocomplete_skola'), + path('auth/reset_password', views.resetPasswordView, name='reset_password'), + path('auth/resitel_edit', views.resitelEditView, name='seminar_resitel_edit'), path('', views.TitulniStranaView.as_view(), name='titulni_strana'), # Ceka na autocomplete v3 diff --git a/seminar/views.py b/seminar/views.py index ee4dbc3a..60c75a1f 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -10,6 +10,7 @@ from django.http import Http404,HttpResponseBadRequest,HttpResponseRedirect from django.db.models import Q from django.views.decorators.csrf import ensure_csrf_cookie from django.contrib.auth import authenticate, login, get_user_model, logout +from django.contrib.auth.mixins import LoginRequiredMixin from django.db import transaction from dal import autocomplete @@ -951,7 +952,20 @@ def texDownloadView(request, rocnik, cislo): cislo.save() return JsonResponse(response) +class ResitelView(LoginRequiredMixin,generic.DetailView): + model = Resitel + template_name = 'seminar/resitel.html' + + def get_object(self, queryset=None): + print(self.request.user) + return Resitel.objects.get(osoba__user=self.request.user) + ## Formulare +def resitelEditView(request): + pass +def resetPasswordView(request): + pass + def loginView(request): if request.method == 'POST': form = LoginForm(request.POST)