Commit ac90245f authored by Armin Leuprecht's avatar Armin Leuprecht
Browse files

chore: Upgrade django to 3.2



Adapt some sources and especially repair the
versions for node-modules.
Signed-off-by: Armin Leuprecht's avatarArmin Leuprecht <mir@mur.at>
parent ff67c6bf
Pipeline #413210768 failed with stage
in 1 minute and 54 seconds
# Django stuff
from django.apps import AppConfig
from django.utils.translation import ugettext_lazy as _
class AppearenceConfig(AppConfig):
name = 'appearence'
name = 'appearance'
verbose_name = _("Erscheinungsbild")
# Django stuff
from django.apps import AppConfig
class FlatpageOverrideConfig(AppConfig):
name = 'flatpage_override'
name = 'flatpages_override'
......@@ -208,6 +208,9 @@ STATICFILES_FINDERS = (
MEDIA_ROOT = os.path.join(PROJECT_ROOT, "media")
MEDIA_URL = "/media/"
# auto field new in django 3.2
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
# registration settings
ACCOUNT_ACTIVATION_DAYS = 7
# LOGIN_REDIRECT_URL = '/'
......@@ -216,29 +219,31 @@ ACCOUNT_ACTIVATION_DAYS = 7
NODE_MODULES_ROOT = os.path.join(PROJECT_ROOT, "components")
YARN_INSTALLED_APPS = (
"jquery-sortable#0.9.13",
"blueimp-file-upload#9.18.0",
"moment#2.10.6",
"bootstrap-select#1.7.7",
"leaflet.markercluster#1.4.1",
"leaflet.awesome-markers#2.0.2",
"leaflet-control-geocoder#1.9.0",
# "pelias-leaflet-plugin#1.12.0",
"fork-awesome#1.1.5",
"eonasdan-bootstrap-datetimepicker#4.17.37",
"bootstrap#3.3.6",
"bootstrap-daterangepicker#2.1.13",
"jquery#2.2.4",
"bootstrap3-dialog#1.34.9",
"fullcalendar#3.4.0",
"imagesloaded#4.1.1",
"ev-emitter#1.0.3",
"qtip2#2.2.1",
"d3#4.5.0",
"https://github.com/cowboy/jquery-tiny-pubsub.git",
"vue#2.3.3",
"vue-resource#1.3.3",
"lodash#4.17.4",
"jquery-sortable@0.9.13",
"blueimp-file-upload@9.18.0",
"moment@2.10.6",
"bootstrap-select@1.7.7",
"leaflet.markercluster@1.4.1",
"leaflet.awesome-markers@2.0.5",
"leaflet-control-geocoder@1.9.0",
"leaflet.photon@0.8.0",
"pelias-leaflet-plugin@1.12.0",
"fork-awesome@1.1.5",
"eonasdan-bootstrap-datetimepicker@4.17.49",
"bootstrap@3.3.6",
"bootstrap-daterangepicker@2.1.13",
"jquery@2.2.4",
"bootstrap3-dialog@1.35.4",
"fullcalendar@3.4.0",
"imagesloaded@4.1.1",
"ev-emitter@1.0.3",
"qtip2@2.2.0",
# "d3@4.5.0",
"jquery-tiny-pubsub@0.7.0",
# "https://github.com/cowboy/jquery-tiny-pubsub.git",
"vue@2.3.3",
"vue-resource@1.3.3",
"lodash@4.17.4",
)
......
......@@ -2,6 +2,7 @@
# Standard Library
import datetime
from functools import partial
from io import BytesIO
# Django stuff
......@@ -10,7 +11,6 @@ from django.contrib.gis.db import models
from django.core.files.base import ContentFile
from django.db.models.signals import post_init, post_save
from django.template.loader import render_to_string
from django.utils.functional import curry
from django.utils.translation import ugettext_lazy as _
# Third party
......@@ -171,8 +171,8 @@ class Initiative(models.Model):
verbose_name = "get_{}_verbose_name".format(field)
help_text = "get_{}_help_text".format(field)
curried_verbose_name = curry(self._get_verbose_name, field)
curried_help_text = curry(self._get_help_text, field)
curried_verbose_name = partial(self._get_verbose_name, field)
curried_help_text = partial(self._get_help_text, field)
setattr(self, verbose_name, curried_verbose_name)
setattr(self, help_text, curried_help_text)
......
......@@ -50,7 +50,7 @@ class Profile(models.Model):
)
regions = MultiSelectField(
verbose_name=_("Bezirke"), max_length=1000, null=True, blank=True
verbose_name=_("Bezirke"), choices=get_county_choices(), max_length=1000, null=True, blank=True
)
matrix_id = models.CharField(_("Matrix-ID"), max_length=50, null=True, blank=True)
......
......@@ -134,7 +134,7 @@
</div>
</script>
<script type="text/javascript" src="{% static 'lodash/dist/lodash.min.js' %}"></script>
<script type="text/javascript" src="{% static 'lodash/lodash.min.js' %}"></script>
<script type="text/javascript" src="{% static 'vue/dist/vue.min.js' %}"></script>
<script type="text/javascript" src="{% static 'vue-resource/dist/vue-resource.min.js' %}"></script>
<script type="text/javascript" src="{% static 'jquery-tiny-pubsub/dist/ba-tiny-pubsub.min.js' %}"></script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment