From 03d83a6a80cb7860f91e327e457afbe3bceceee1 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sun, 3 May 2020 18:24:35 +0200
Subject: [PATCH] Fix list combination
---
aleksis/core/mixins.py | 2 +-
apps/official/AlekSIS-App-Chronos | 2 +-
apps/official/AlekSIS-App-DashboardFeeds | 2 +-
apps/official/AlekSIS-App-Hjelp | 2 +-
apps/official/AlekSIS-App-LDAP | 2 +-
apps/official/AlekSIS-App-Untis | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/aleksis/core/mixins.py b/aleksis/core/mixins.py
index dafa928a8..e958c75f7 100644
--- a/aleksis/core/mixins.py
+++ b/aleksis/core/mixins.py
@@ -184,7 +184,7 @@ class ExtensibleModel(models.Model):
return [
field
- for field in cls._meta.fields + cls._extended_data_fields
+ for field in list(cls._meta.fields) + cls._extended_data_fields
if (field.editable and not field.auto_created and not field.is_relation)
]
diff --git a/apps/official/AlekSIS-App-Chronos b/apps/official/AlekSIS-App-Chronos
index 23a4be92b..d0c674577 160000
--- a/apps/official/AlekSIS-App-Chronos
+++ b/apps/official/AlekSIS-App-Chronos
@@ -1 +1 @@
-Subproject commit 23a4be92b84da38cea0f3d9ac382ba03e63ff139
+Subproject commit d0c674577acb61054369f3086f0d0782c6b0a57f
diff --git a/apps/official/AlekSIS-App-DashboardFeeds b/apps/official/AlekSIS-App-DashboardFeeds
index e93849fb3..a7bd17eea 160000
--- a/apps/official/AlekSIS-App-DashboardFeeds
+++ b/apps/official/AlekSIS-App-DashboardFeeds
@@ -1 +1 @@
-Subproject commit e93849fb326fddf183d42a5b167425b061ffa124
+Subproject commit a7bd17eea561f28f6693e1c0b5b58383f5a829ce
diff --git a/apps/official/AlekSIS-App-Hjelp b/apps/official/AlekSIS-App-Hjelp
index 3006443bd..9cbc0dc7d 160000
--- a/apps/official/AlekSIS-App-Hjelp
+++ b/apps/official/AlekSIS-App-Hjelp
@@ -1 +1 @@
-Subproject commit 3006443bda5b013a71972dc4b56b778e6ade3247
+Subproject commit 9cbc0dc7d39ccc424c75011c803f29948daf93e1
diff --git a/apps/official/AlekSIS-App-LDAP b/apps/official/AlekSIS-App-LDAP
index 372111712..de809e65e 160000
--- a/apps/official/AlekSIS-App-LDAP
+++ b/apps/official/AlekSIS-App-LDAP
@@ -1 +1 @@
-Subproject commit 3721117128d3c449dd0001627854faa9c0c26d1e
+Subproject commit de809e65e8bf107b761c4a984f14ef517a531f23
diff --git a/apps/official/AlekSIS-App-Untis b/apps/official/AlekSIS-App-Untis
index df755acbc..a567021ee 160000
--- a/apps/official/AlekSIS-App-Untis
+++ b/apps/official/AlekSIS-App-Untis
@@ -1 +1 @@
-Subproject commit df755acbcafb7aaa95efec0cd80478885d8feb72
+Subproject commit a567021ee5e66657b3374a76865bab1ee9bdbc33
--
GitLab