Fix #1416 -- Add canonical geodata field (#1458)

* Fix #1416 -- Add canonical geodata field for events and subevents

* Add optional geocoding through OpenCageData

* Fix markup everywhere

* Add Leaflet map to geo coordinates

* Fix tests, add credits

* Fix spelling
This commit is contained in:
Raphael Michel
2019-10-21 13:07:35 +02:00
committed by GitHub
parent 19b10e3ca4
commit 27538d220e
30 changed files with 1098 additions and 9 deletions

View File

@@ -14,6 +14,7 @@ from django.utils.translation.trans_real import (
parse_accept_lang_header,
)
from pretix.base.settings import GlobalSettingsObject
from pretix.multidomain.urlreverse import get_domain
_supported = None
@@ -187,6 +188,11 @@ class SecurityMiddleware(MiddlewareMixin):
# https://github.com/pretix/pretix/issues/765
resp['P3P'] = 'CP=\"ALL DSP COR CUR ADM TAI OUR IND COM NAV INT\"'
img_src = []
gs = GlobalSettingsObject()
if gs.settings.leaflet_tiles:
img_src.append(gs.settings.leaflet_tiles[:gs.settings.leaflet_tiles.index("/", 10)].replace("{s}", "*"))
h = {
'default-src': ["{static}"],
'script-src': ['{static}', 'https://checkout.stripe.com', 'https://js.stripe.com'],
@@ -196,7 +202,7 @@ class SecurityMiddleware(MiddlewareMixin):
'child-src': ['{static}', 'https://checkout.stripe.com', 'https://js.stripe.com'],
'style-src': ["{static}", "{media}"],
'connect-src': ["{dynamic}", "{media}", "https://checkout.stripe.com"],
'img-src': ["{static}", "{media}", "data:", "https://*.stripe.com"],
'img-src': ["{static}", "{media}", "data:", "https://*.stripe.com"] + img_src,
'font-src': ["{static}"],
'media-src': ["{static}", "data:"],
# form-action is not only used to match on form actions, but also on URLs

View File

@@ -0,0 +1,33 @@
# Generated by Django 2.2.1 on 2019-10-19 13:17
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('pretixbase', '0138_auto_20191017_1151'),
]
operations = [
migrations.AddField(
model_name='event',
name='geo_lat',
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='event',
name='geo_lon',
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='subevent',
name='geo_lat',
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='subevent',
name='geo_lon',
field=models.FloatField(null=True),
),
]

View File

@@ -324,6 +324,14 @@ class Event(EventMixin, LoggedModel):
max_length=200,
verbose_name=_("Location"),
)
geo_lat = models.FloatField(
verbose_name=_("Latitude"),
null=True, blank=True,
)
geo_lon = models.FloatField(
verbose_name=_("Longitude"),
null=True, blank=True,
)
plugins = models.TextField(
null=False, blank=True,
verbose_name=_("Plugins"),
@@ -929,6 +937,14 @@ class SubEvent(EventMixin, LoggedModel):
max_length=200,
verbose_name=_("Location"),
)
geo_lat = models.FloatField(
verbose_name=_("Latitude"),
null=True, blank=True,
)
geo_lon = models.FloatField(
verbose_name=_("Longitude"),
null=True, blank=True
)
frontpage_text = I18nTextField(
null=True, blank=True,
verbose_name=_("Frontpage text")

View File

@@ -704,6 +704,18 @@ Your {event} team"""))
'default': '',
'type': LazyI18nString
},
'opencagedata_apikey': {
'default': None,
'type': str
},
'leaflet_tiles': {
'default': None,
'type': str
},
'leaflet_tiles_attribution': {
'default': None,
'type': str
},
'frontpage_subevent_ordering': {
'default': 'date_ascending',
'type': str