Skip to content
Snippets Groups Projects
Commit 32cb8a12 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

run hooks

parent a95868cc
No related branches found
No related tags found
2 merge requests!787Release,!749Add personal calendars, move from requests-cache to Django cache
Pipeline #12415 passed
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
line_length = 88 line_length = 88
multi_line_output = 3 multi_line_output = 3
include_trailing_comma = true include_trailing_comma = true
known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevents,icalevnt,markdown,modelcluster,pirates,pytest,pytz,requests,sentry_sdk,taggit,wagtail,wagtailmetadata,weasyprint,yaml known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevents,markdown,modelcluster,pirates,pytest,pytz,requests,sentry_sdk,taggit,wagtail,wagtailmetadata,weasyprint,yaml
...@@ -109,10 +109,7 @@ class PersonCalendarMixin(CalendarMixin): ...@@ -109,10 +109,7 @@ class PersonCalendarMixin(CalendarMixin):
def get_parsed_calendar_data(self) -> list: def get_parsed_calendar_data(self) -> list:
calendar_format_events = [] calendar_format_events = []
for event in ( for event in self.calendar.past_events + self.calendar.future_events:
self.calendar.past_events
+ self.calendar.future_events
):
parsed_event = { parsed_event = {
"allDay": event["all_day"], "allDay": event["all_day"],
"start": event["start"].isoformat(), "start": event["start"].isoformat(),
......
# Generated by Django 4.1.8 on 2023-04-16 12:45 # Generated by Django 4.1.8 on 2023-04-16 12:45
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('calendar_utils', '0004_auto_20220505_1228'), ("calendar_utils", "0004_auto_20220505_1228"),
('district', '0109_districtpersonpage_ical_calendar_url'), ("district", "0109_districtpersonpage_ical_calendar_url"),
] ]
operations = [ operations = [
migrations.RemoveField( migrations.RemoveField(
model_name='districtpersonpage', model_name="districtpersonpage",
name='ical_calendar_url', name="ical_calendar_url",
), ),
migrations.AddField( migrations.AddField(
model_name='districtpersonpage', model_name="districtpersonpage",
name='calendar', name="calendar",
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='calendar_utils.calendar'), field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
to="calendar_utils.calendar",
),
), ),
migrations.AddField( migrations.AddField(
model_name='districtpersonpage', model_name="districtpersonpage",
name='calendar_url', name="calendar_url",
field=models.URLField(blank=True, null=True, verbose_name='URL kalendáře ve formátu iCal'), field=models.URLField(
blank=True, null=True, verbose_name="URL kalendáře ve formátu iCal"
),
), ),
] ]
# Generated by Django 4.1.8 on 2023-04-16 12:45 # Generated by Django 4.1.8 on 2023-04-16 12:45
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('calendar_utils', '0004_auto_20220505_1228'), ("calendar_utils", "0004_auto_20220505_1228"),
('main', '0055_remove_mainpersonpage_nextcloud_calendar_url_and_more'), ("main", "0055_remove_mainpersonpage_nextcloud_calendar_url_and_more"),
] ]
operations = [ operations = [
migrations.RemoveField( migrations.RemoveField(
model_name='mainpersonpage', model_name="mainpersonpage",
name='ical_calendar_url', name="ical_calendar_url",
), ),
migrations.AddField( migrations.AddField(
model_name='mainpersonpage', model_name="mainpersonpage",
name='calendar', name="calendar",
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='calendar_utils.calendar'), field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
to="calendar_utils.calendar",
),
), ),
migrations.AddField( migrations.AddField(
model_name='mainpersonpage', model_name="mainpersonpage",
name='calendar_url', name="calendar_url",
field=models.URLField(blank=True, null=True, verbose_name='URL kalendáře ve formátu iCal'), field=models.URLField(
blank=True, null=True, verbose_name="URL kalendáře ve formátu iCal"
),
), ),
] ]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment