diff --git a/foerderbarometer/settings.py b/foerderbarometer/settings.py index 885321d..1672ed0 100755 --- a/foerderbarometer/settings.py +++ b/foerderbarometer/settings.py @@ -17,7 +17,7 @@ from pathlib import Path from django.core.exceptions import ImproperlyConfigured # prefix for urls in mails -URLPREFIX = 'http://localhost:8000' +URLPREFIX = 'https://fdb-devel.wikimedia.de' # mails in development go to stdout @@ -163,7 +163,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' # OAuth Settings -OAUTH_URL_WHITELISTS = ['/admin', '/index'] +OAUTH_URL_WHITELISTS = ['/admin'] OAUTH_CLIENT_NAME = '' OAUTH_CLIENT_NAME = get_secret('OAUTH_CLIENT_NAME') @@ -175,7 +175,7 @@ OAUTH_CLIENT = { 'access_token_url': 'https://meta.wikimedia.org/w/rest.php/oauth2/access_token', 'authorize_url': 'https://meta.wikimedia.org/w/rest.php/oauth2/authorize', 'api_base_url': 'https://meta.wikimedia.org/w/rest.php/oauth2/resource', - 'redirect_uri': 'http://localhost:8000/oauth/callback', + 'redirect_uri': 'https://fdb-devel.wikimedia.de/oauth/callback', 'client_kwargs': { 'scope': 'basic', 'token_placement': 'header' diff --git a/input/models.py b/input/models.py index 9bdd3d7..b1b617a 100755 --- a/input/models.py +++ b/input/models.py @@ -1,9 +1,7 @@ from datetime import date -from django.utils.http import urlencode + from django.db import models from django.utils.html import format_html -import urllib -from django.utils.safestring import mark_safe from .settings import ACCOUNTS @@ -15,7 +13,7 @@ EMAIL_STATES = {'NONE': 'noch keine Mail versendet', class Volunteer(models.Model): realname = models.CharField(max_length=200, null=True, verbose_name="Realname", - help_text="Bitte gib deinen Vornamen und deinen Nachnamen ein.", default='oi') + help_text="Bitte gib deinen Vornamen und deinen Nachnamen ein.", default='') email = models.EmailField(max_length=200, null=True, verbose_name='E-Mail-Adresse', help_text=format_html('Bitte gib deine E-Mail-Adresse ein, damit dich
Wikimedia Deutschland bei Rückfragen oder für
die Zusage kontaktieren kann.')) @@ -102,42 +100,14 @@ class Project(Volunteer): project_of_year = models.IntegerField(default=0) end_quartal = models.CharField(max_length=15, null=True, blank=True, verbose_name="Quartal Projekt Ende") - def save(self,*args,**kwargs): '''we generate the autogenerated fields here''' # we don't call save with args/kwargs to avoid UNIQUE CONSTRAINT errors # but maybe there is a better solution? - preotrs = self.otrs - - #postotrs = '' - #for n in range(len(preotrs)): - # if preotrs[n] == ';': - # postotrs += '\;' - # else: - # postotrs += preotrs[n] - #print(self.otrs) - #print(preotrs) - #print(postotrs) - postotrs = urllib.parse.quote(preotrs, safe=':;/=?&') - self.otrs = mark_safe(urllib.parse.unquote(postotrs)) - startyear_tmp = 'NONE' - - if self.pid: - print('self pid last four', self.pid[:4], self.start.year) - if int(self.pid[:4]) != int(self.start.year): - startyear_tmp = self.start.year - - print('the startyear_tmp is as follows ', startyear_tmp) - super().save() - - if startyear_tmp == 'NONE': - - self.pid = str(self.start.year) + '-' + str(self.account.code) + str(self.pk).zfill(3) - # self.pid = str(self.account.code) + str(self.pk).zfill(3) - - - + self.pid = str(self.start.year) + '-' + str(self.account.code) + str(self.pk).zfill(3) + # self.pid = str(self.account.code) + str(self.pk).zfill(3) + # generation of field quartals if self.end.month in [1, 2, 3]: self.end_quartal = 'Q1' @@ -149,25 +119,13 @@ class Project(Volunteer): self.end_quartal = 'Q4' # generation of pid and financeID - # project of year is true if entry gets updated with changes.. but year can change!!!!!!!! - if self.project_of_year: - print('oi oi oi oi oi') - print(self.pid) - - - - # project of year is false if entry gets saved as new - if not self.project_of_year or startyear_tmp != 'NONE': - print('AAA') - - print('self projekt of year', self.project_of_year, self.start.year) - + if not self.project_of_year: + #print('AAA') # we need to determine if this is a new year with its first new project... year = self.start.year #print(year) projects = Project.objects.filter(start__year=year) - print('projects after filter of startyear of project',projects) if not projects: #print('BBB') self.project_of_year = 1 diff --git a/input/templates/input/index.html b/input/templates/input/index.html index 83db377..3c2a9f3 100755 --- a/input/templates/input/index.html +++ b/input/templates/input/index.html @@ -45,8 +45,8 @@ Herzlich willkommen im Förderanfrageportal von Wikimedia Deutschland!

- OAUTH - OAUTH +

Um eine Unterstützungsleistung im Rahmen der Förderangebote anfragen zu können, verifiziere dich bitte mit deinem Wikimedia-Konto. @@ -55,7 +55,7 @@ Um eine Unterstützungsleistung im Rahmen der Förderangebote anfragen zu könne Förderportal in der deutschsprachigen Wikipedia.

-
Anmelden
+
Anmelden

Für alle Fragen wende dich gern an das Team Communitys und Engagement.