pydev-s6git

diff --git a/debian/eigenheimer-util.changelog b/debian/eigenheimer-util.changelog
index b46e67324a13b0ea02d178c849fdb9ee400e3608..b27984b3d0fb605ba69da0380952b10d27f00bb1 100644 (file)
--- a/debian/eigenheimer-util.changelog
+++ b/debian/eigenheimer-util.changelog
@@ -1,4 +1,4 @@
 svbal (0.1-%BUILD%) unstable; urgency=medium
-  * initial version: Ausweiserstellung
+  * initial version: Ausweiserstellung, Kassenbrief
  -- Michael Wagner <info@wagnertech.de>  Sat, 06 Jun 2020 20:03:04 +0100
 

diff --git a/debian/eigenheimer-util.control b/debian/eigenheimer-util.control
index b9286612d690db31f376d1fbf44a90046c73b6d1..c2827a6322ead9ec95263e8b61b6e23934f6504c 100644 (file)
--- a/debian/eigenheimer-util.control
+++ b/debian/eigenheimer-util.control
@@ -6,7 +6,7 @@ Build-Depends: git, mbuild
  
 Package: eigenheimer-util
 Architecture: all
-Depends: texlive-latex-base, texlive-latex-recommended, texlive-lang-german, python3, apache2, libapache2-mod-wsgi-py3
+Depends: texlive-latex-base, texlive-latex-recommended, texlive-lang-german, python3, apache2, libapache2-mod-wsgi-py3, python3-django
 Description: Mitgliederverwaltung Eigenheimerverband
  .
 

diff --git a/debian/eigenheimer-util.cp b/debian/eigenheimer-util.cp
index 52024fb346587391b5293251732ebf9b92312402..ab5f381e1fd56f17e841a6d29bb685eeaf13cb88 100755 (executable)
--- a/debian/eigenheimer-util.cp
+++ b/debian/eigenheimer-util.cp
@@ -2,7 +2,7 @@
 set -e
 
 mkdir -p $1/opt
-cp -r python/eh_util $1/opt
+cp -r python/eh_util $1/opt/
 
 # DB löschen
 rm $1/opt/eh_util/db.sqlite3

diff --git a/debian/eigenheimer-util.postinst b/debian/eigenheimer-util.postinst
index 475ac41d3e3b491a0d0115f8cb90b058503b8f2e..d26470dcc7d90f52229e76508323000a4ccd4224 100755 (executable)
--- a/debian/eigenheimer-util.postinst
+++ b/debian/eigenheimer-util.postinst
@@ -4,7 +4,7 @@ set -e
 # DB anlegen/migrieren
 /opt/eh_util/manage.py migrate
 
-# activate verleihnix configuration
+# activate eh_util configuration
 if ! test -e /etc/apache2/sites-enabled/eh_util.conf
 then
        a2ensite eh_util

diff --git a/python/eh_util/eh_app/views.py b/python/eh_util/eh_app/views.py
index 4cd1ae8f4aaf771f884fd4aa33a956c3b82ec212..47e089707d2a06b21693814e306c16ad45a73a91 100644 (file)
--- a/python/eh_util/eh_app/views.py
+++ b/python/eh_util/eh_app/views.py
@@ -24,6 +24,7 @@ except:
 
 def index(request, verein):
     template = loader.get_template("vbasis.html")
+    raise RuntimeError("blub")
     return HttpResponse(template.render({"verein" : verein}, request))
 
 def tex_bearbeiten(request, verein):

diff --git a/python/eh_util/eh_util/settings.py b/python/eh_util/eh_util/settings.py
index ccd8d18d13f9cdab94a98894aa524c0f5001598b..d90a3e56c0f289c8ddb6b28a65fe5bf82f692a2c 100644 (file)
--- a/python/eh_util/eh_util/settings.py
+++ b/python/eh_util/eh_util/settings.py
@@ -14,7 +14,7 @@ import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
+MEDIA_ROOT = BASE_DIR
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
@@ -27,6 +27,7 @@ DEBUG = True
 
 ALLOWED_HOSTS = []
 
+LOGIN_URL = "/eh-util/login"
 
 # Application definition
 
@@ -57,7 +58,7 @@ ROOT_URLCONF = 'eh_util.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': ["eh_util/templates", "eh_utils/eh_app/templates/svbal"],
+        'DIRS': [os.path.join(BASE_DIR, "eh_util/templates"), os.path.join(BASE_DIR, "eh_utils/eh_app/templates/svbal")],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -79,7 +80,7 @@ WSGI_APPLICATION = 'eh_util.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'db.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
 

diff --git a/python/eh_util/eh_util/urls.py b/python/eh_util/eh_util/urls.py
index 0d8d93c19135112f003f8ec1205dab70c7675d5c..344817ad32062fcfda0a8eb64b90b83d45aa546d 100644 (file)
--- a/python/eh_util/eh_util/urls.py
+++ b/python/eh_util/eh_util/urls.py
@@ -20,7 +20,7 @@ from . import views
 
 urlpatterns = [
     path('', views.index),
-    path('accounts/login/', views.login),
+    path('login/', views.login),
     path('admin/', admin.site.urls),
     path('eh-abgleich/', include('eh_abgleich.urls')),
 #    path('<slug:verein>/', views.vbasis),

diff --git a/python/eh_util/eh_util/views.py b/python/eh_util/eh_util/views.py
index 24c9c35e1523764591f1a91f842f82f474ba70b3..0262e40888976d459ce3260d2fe3f502fb48fcbd 100644 (file)
--- a/python/eh_util/eh_util/views.py
+++ b/python/eh_util/eh_util/views.py
@@ -48,5 +48,6 @@ def login(request):
     
 def vbasis(request, verein):
     template = loader.get_template("vbasis.html")
+    raise RuntimeError("blub")
     return HttpResponse(template.render({"verein" : verein}, request))