sparky2021@pydev-s6

diff --git a/python/eh_util/eh_app/views.py b/python/eh_util/eh_app/views.py
index 5137ace6f346f9dc72d1482431cb3b5db9feda9c..4cd1ae8f4aaf771f884fd4aa33a956c3b82ec212 100644 (file)
--- a/python/eh_util/eh_app/views.py
+++ b/python/eh_util/eh_app/views.py
@@ -35,17 +35,20 @@ def kassenbrief(request, verein):
     fehlertext = ""
     # Hole Daten aus der Config
     vconf = config.getInstance(verein)
-    briefpapier    = vconf.getConfig("briefpapier")
     beitrag_basis  = vconf.getConfig("beitrag_basis", 0)
     beitrag_zusatz = vconf.getConfig("beitrag_zusatz", 0)
-    briefpapier_label = briefpapier
-    if not briefpapier:
-        briefpapier_label = "Kein Briefpapier ausgewäht"
+
+    # suche Templates
+    import os
+    dirlist = os.listdir("eh_app/templates/"+verein) # returns list
+    template_list = []
+    for t in dirlist:
+        template_list.append((t,t))
     
     # if this is a POST request we need to process the form data
     if request.method == 'POST':
         # create a form instance and populate it with data from the request:
-        form = KassenbriefForm(request.POST, request.FILES)
+        form = KassenbriefForm(request.POST, request.FILES, dirlist)
         # check whether it's valid:
         if form.is_valid():
             # bei Änderungen Konfiguration aktualisieren
@@ -78,9 +81,10 @@ def kassenbrief(request, verein):
 
     # if a GET (or any other method) we'll create a blank form
     else:
-        form = KassenbriefForm(initial={'basisbeitrag': beitrag_basis, 'zusatzbeitrag': beitrag_zusatz})
+        form = KassenbriefForm(templates=template_list, initial={'basisbeitrag': beitrag_basis, 'zusatzbeitrag': beitrag_zusatz})
+        #form = KassenbriefForm(initial={'basisbeitrag': beitrag_basis, 'zusatzbeitrag': beitrag_zusatz})
 
-    return render(request, 'kassenbrief.html', {'form': form, 'verein': verein, 'briefpapier': briefpapier_label, 'fehlertext' : fehlertext})
+    return render(request, 'kassenbrief.html', {'form': form, 'verein': verein, 'fehlertext' : fehlertext})
     
     '''
     template = loader.get_template("kassenbrief.html")

diff --git a/python/eh_util/eh_util/settings.py b/python/eh_util/eh_util/settings.py
index 6a67c6e00be2dc61d1598c7ad1fee7e00967cc64..ccd8d18d13f9cdab94a98894aa524c0f5001598b 100644 (file)
--- a/python/eh_util/eh_util/settings.py
+++ b/python/eh_util/eh_util/settings.py
@@ -57,7 +57,7 @@ ROOT_URLCONF = 'eh_util.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': ["eh_util/templates", "/opt/eh_util/eh_util/templates"],
+        'DIRS': ["eh_util/templates", "eh_utils/eh_app/templates/svbal"],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [

diff --git a/python/eh_util/eh_util/views.py b/python/eh_util/eh_util/views.py
index e4e8444b52975d88f3cb3726969c74db76804936..24c9c35e1523764591f1a91f842f82f474ba70b3 100644 (file)
--- a/python/eh_util/eh_util/views.py
+++ b/python/eh_util/eh_util/views.py
@@ -8,7 +8,7 @@ def index(request):
     return HttpResponse(template.render({}, request))    
 
 def login(request):
-    from django.contrib.auth import authenticate
+    from django.contrib import auth
     from .forms import LoginForm
 
     fehlertext = ""
@@ -18,7 +18,7 @@ def login(request):
         form = LoginForm(request.POST, request.FILES)
         # check whether it's valid:
         if form.is_valid():
-            user = authenticate(
+            user = auth.authenticate(
                 username = request.POST["name"], 
                 password = request.POST["password"],
             )
@@ -27,6 +27,7 @@ def login(request):
             fehlertext = "Login fehlgeschlagen"
             
         else:
+            auth.login(request, user)
             next = request.POST.get("next", None)
             if next:
                 return HttpResponseRedirect(next)