From c32e496279a663557986273d7627ed24537b37a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Tue, 19 May 2020 23:12:30 +0200
Subject: [PATCH] Add missing migration for hidden plan & revert obsolete
format change
---
AKModel/migrations/0035_event_plan_hidden.py | 18 ++++++++++++++
AKPlan/templates/AKPlan/encode_events.html | 26 ++++++++++----------
2 files changed, 31 insertions(+), 13 deletions(-)
create mode 100644 AKModel/migrations/0035_event_plan_hidden.py
diff --git a/AKModel/migrations/0035_event_plan_hidden.py b/AKModel/migrations/0035_event_plan_hidden.py
new file mode 100644
index 00000000..1a5dbed7
--- /dev/null
+++ b/AKModel/migrations/0035_event_plan_hidden.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.6 on 2020-05-19 20:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('AKModel', '0034_room_rename_field'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='event',
+ name='plan_hidden',
+ field=models.BooleanField(default=True, help_text='Hides plan for non-staff users', verbose_name='Plan Hidden'),
+ ),
+ ]
diff --git a/AKPlan/templates/AKPlan/encode_events.html b/AKPlan/templates/AKPlan/encode_events.html
index f8569e61..c38a4652 100644
--- a/AKPlan/templates/AKPlan/encode_events.html
+++ b/AKPlan/templates/AKPlan/encode_events.html
@@ -2,17 +2,17 @@
{% load tags_AKPlan %}
[
- {% for slot in slots %}
- {% if slot.start %}
- {
- 'title': '{{ slot.ak.name }}',
- 'start': '{{ slot.start | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
- 'end': '{{ slot.end | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
- 'resourceId': '{{ slot.room.title }}',
- 'backgroundColor': '{{ slot|highlight_change_colors }}',
- 'borderColor': '{{ slot.ak.category.color }}',
- 'url': '{% url 'submit:ak_detail' event_slug=event.slug pk=slot.ak.pk %}'
- },
- {% endif %}
- {% endfor %}
+ {% for slot in slots %}
+ {% if slot.start %}
+ {
+ 'title': '{{ slot.ak.name }}',
+ 'start': '{{ slot.start | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
+ 'end': '{{ slot.end | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
+ 'resourceId': '{{ slot.room.title }}',
+ 'backgroundColor': '{{ slot|highlight_change_colors }}',
+ 'borderColor': '{{ slot.ak.category.color }}',
+ 'url': '{% url 'submit:ak_detail' event_slug=event.slug pk=slot.ak.pk %}'
+ },
+ {% endif %}
+ {% endfor %}
]
--
GitLab