ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add `frontend_url` field to wagtail pages

This commit is contained in:
Daniel Egger 2022-10-03 17:40:35 +02:00
parent 5b3a751704
commit cbdbdba6b8
19 changed files with 449 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/MainNavigationBar.vue
View File

@ -170,7 +170,7 @@ const profileDropdownData = [
Shop Shop
</router-link> </router-link>
<router-link <router-link
to="/media/versicherungsvermittlerin-media/overview" to="/media/versicherungsvermittlerin-media"
class="nav-item" class="nav-item"
:class="{ 'nav-item--active': isInRoutePath(['/media']) }" :class="{ 'nav-item--active': isInRoutePath(['/media']) }"
> >

7
client/src/components/learningPath/LearningPathDiagram.vue
View File

@ -67,10 +67,7 @@ export default {
const newCircle = {}; const newCircle = {};
newCircle.pieData = pieData.reverse(); newCircle.pieData = pieData.reverse();
newCircle.title = circle.title; newCircle.title = circle.title;
newCircle.slug = circle.slug.replace( newCircle.frontend_url = circle.frontend_url;
`${circle.parentLearningPath.slug}-circle-`,
""
);
newCircle.id = circle.id; newCircle.id = circle.id;
internalCircles.push(newCircle); internalCircles.push(newCircle);
}); });
@ -155,7 +152,7 @@ export default {
}); });
}) })
.on("click", (d, i) => { .on("click", (d, i) => {
vueRouter.push(`/learn/${this.learningPathStore.learningPath.slug}/${i.slug}`); vueRouter.push(i.frontend_url);
}) })
.attr("role", "button"); .attr("role", "button");

3
client/src/router/index.ts
View File

@ -40,7 +40,8 @@ const router = createRouter({
}, },
{ {
path: "handlungsfelder", path: "handlungsfelder",
component: () => import("@/views/media_library/MediaLibraryCategoryOverview.vue"), component: () =>
import("@/views/media_library/MediaLibraryCategoryOverview.vue"),
}, },
{ {
path: "handlungsfeldlist", path: "handlungsfeldlist",

10
client/src/services/circle.ts
View File

@ -21,6 +21,7 @@ function _createEmptyLearningUnit(
slug: "", slug: "",
translation_key: "", translation_key: "",
type: "learnpath.LearningUnit", type: "learnpath.LearningUnit",
frontend_url: "",
learningContents: [], learningContents: [],
minutes: 0, minutes: 0,
parentLearningSequence: parentLearningSequence, parentLearningSequence: parentLearningSequence,
@ -131,7 +132,8 @@ export class Circle implements CourseWagtailPage {
public readonly slug: string, public readonly slug: string,
public readonly title: string, public readonly title: string,
public readonly translation_key: string, public readonly translation_key: string,
public description: string, public readonly frontend_url: string,
public readonly description: string,
public children: CircleChild[], public children: CircleChild[],
public goals: CircleGoal[], public goals: CircleGoal[],
public job_situations: CircleJobSituation[], public job_situations: CircleJobSituation[],
@ -147,6 +149,7 @@ export class Circle implements CourseWagtailPage {
json.slug, json.slug,
json.title, json.title,
json.translation_key, json.translation_key,
json.frontend_url,
json.description, json.description,
json.children, json.children,
json.goals, json.goals,
@ -241,9 +244,4 @@ export class Circle implements CourseWagtailPage {
this.parentLearningPath.calcNextLearningContent(completionData); this.parentLearningPath.calcNextLearningContent(completionData);
} }
} }
public getUrl(): string {
const shortSlug = this.slug.replace(`${this.parentLearningPath?.slug}-circle-`, "");
return `/learn/${this.parentLearningPath?.slug}/${shortSlug}`;
}
} }

2
client/src/services/learningPath.ts
View File

@ -35,6 +35,7 @@ export class LearningPath implements CourseWagtailPage {
json.slug, json.slug,
json.title, json.title,
json.translation_key, json.translation_key,
json.frontend_url,
json.course.id, json.course.id,
json.children, json.children,
completionData completionData
@ -46,6 +47,7 @@ export class LearningPath implements CourseWagtailPage {
public readonly slug: string, public readonly slug: string,
public readonly title: string, public readonly title: string,
public readonly translation_key: string, public readonly translation_key: string,
public readonly frontend_url: string,
public readonly courseId: number, public readonly courseId: number,
public children: LearningPathChild[], public children: LearningPathChild[],
completionData?: CourseCompletion[] completionData?: CourseCompletion[]

10
client/src/stores/circle.ts
View File

@ -94,25 +94,23 @@ export const useCircleStore = defineStore({
} }
}, },
openLearningContent(learningContent: LearningContent) { openLearningContent(learningContent: LearningContent) {
const shortSlug = learningContent.slug.replace(`${this.circle?.slug}-lc-`, "");
this.router.push({ this.router.push({
path: `${this.circle?.getUrl()}/${shortSlug}`, path: learningContent.frontend_url,
}); });
}, },
closeLearningContent() { closeLearningContent() {
this.router.push({ this.router.push({
path: `${this.circle?.getUrl()}`, path: `${this.circle?.frontend_url}`,
}); });
}, },
openSelfEvaluation(learningUnit: LearningUnit) { openSelfEvaluation(learningUnit: LearningUnit) {
const shortSlug = learningUnit.slug.replace(`${this.circle?.slug}-lu-`, "");
this.router.push({ this.router.push({
path: `${this.circle?.getUrl()}/evaluate/${shortSlug}`, path: learningUnit.frontend_url,
}); });
}, },
closeSelfEvaluation() { closeSelfEvaluation() {
this.router.push({ this.router.push({
path: `${this.circle?.getUrl()}`, path: `${this.circle?.frontend_url}`,
}); });
}, },
calcSelfEvaluationStatus(learningUnit: LearningUnit) { calcSelfEvaluationStatus(learningUnit: LearningUnit) {

1
client/src/types.ts
View File

@ -119,6 +119,7 @@ export interface CourseWagtailPage {
readonly title: string; readonly title: string;
readonly slug: string; readonly slug: string;
readonly translation_key: string; readonly translation_key: string;
readonly frontend_url: string;
completion_status: CourseCompletionStatus; completion_status: CourseCompletionStatus;
} }

9
client/src/views/LearningPathView.vue
View File

@ -31,12 +31,9 @@ onMounted(async () => {
const createContinueUrl = (learningPath: LearningPath): [string, boolean] => { const createContinueUrl = (learningPath: LearningPath): [string, boolean] => {
if (learningPath.nextLearningContent) { if (learningPath.nextLearningContent) {
const circle = learningPath.nextLearningContent.parentCircle; const circle = learningPath.nextLearningContent.parentCircle;
const lsShortSlug = const url =
learningPath.nextLearningContent.parentLearningSequence?.slug.replace( learningPath.nextLearningContent.parentLearningSequence?.frontend_url ||
`${circle.slug}-`, circle.frontend_url;
""
);
const url = `/learn/${learningPath.slug}/${learningPath.nextLearningContent.parentCircle.slug}#${lsShortSlug}`;
const isFirst = const isFirst =
learningPath.nextLearningContent.translation_key === learningPath.nextLearningContent.translation_key ===
learningPath.circles[0].flatLearningContents[0].translation_key; learningPath.circles[0].flatLearningContents[0].translation_key;

4
client/src/views/media_library/MediaCategoryDetailView.vue
View File

@ -166,8 +166,8 @@ log.debug("MediaCategoryDetailView created", props.mediaCategorySlug);
const mediaStore = useMediaLibraryStore(); const mediaStore = useMediaLibraryStore();
const mediaCategory = computed(() => { const mediaCategory = computed(() => {
return mediaStore.mediaLibraryPage?.children.find( return mediaStore.mediaLibraryPage?.children.find((category) =>
(category) => category.slug === props.mediaCategorySlug category.slug.endsWith(props.mediaCategorySlug)
); );
}); });

4
client/src/views/media_library/MediaLibraryCategoryOverview.vue
View File

@ -28,9 +28,7 @@ watch(dropdownSelected, (newValue) =>
:key="cat.id" :key="cat.id"
class="bg-white p-4" class="bg-white p-4"
> >
<router-link <router-link :to="cat.frontend_url">
:to="`/media/${mediaStore.mediaLibraryPage.slug}/handlungsfelder/${cat.slug}`"
>
<img class="m-auto" :src="`/static/icons/demo/${cat.overview_icon}.svg`" /> <img class="m-auto" :src="`/static/icons/demo/${cat.overview_icon}.svg`" />
<h3 class="text-base text-center">{{ cat.title }}</h3> <h3 class="text-base text-center">{{ cat.title }}</h3>
</router-link> </router-link>

10
server/vbv_lernwelt/competence/models.py
View File

@ -28,11 +28,6 @@ class CompetenceProfilePage(Page):
return get_it_serializer_class( return get_it_serializer_class(
cls, cls,
[ [
"id",
"title",
"slug",
"type",
"translation_key",
"course", "course",
"children", "children",
], ],
@ -69,11 +64,6 @@ class CompetencePage(Page):
return get_it_serializer_class( return get_it_serializer_class(
cls, cls,
[ [
"id",
"title",
"slug",
"type",
"translation_key",
"children", "children",
], ],
) )

3
server/vbv_lernwelt/course/views.py
View File

@ -1,4 +1,5 @@
import structlog import structlog
from django.views.decorators.cache import cache_page
from rest_framework.decorators import api_view from rest_framework.decorators import api_view
from rest_framework.response import Response from rest_framework.response import Response
from wagtail.models import Page from wagtail.models import Page
@ -11,7 +12,7 @@ logger = structlog.get_logger(__name__)
@api_view(["GET"]) @api_view(["GET"])
# @cache_page(60 * 60 * 8, cache="api_page_cache") @cache_page(60 * 60 * 8, cache="api_page_cache")
def page_api_view(request, slug): def page_api_view(request, slug):
try: try:
page = Page.objects.get(slug=slug, locale__language_code="de-CH") page = Page.objects.get(slug=slug, locale__language_code="de-CH")

43
server/vbv_lernwelt/learnpath/models.py
View File

@ -40,11 +40,17 @@ class LearningPath(Page):
def __str__(self): def __str__(self):
return f"{self.title}" return f"{self.title}"
def get_frontend_url(self):
return f"/learn/{self.slug}"
@classmethod @classmethod
def get_serializer_class(cls): def get_serializer_class(cls):
return get_it_serializer_class( return get_it_serializer_class(
cls, cls,
["id", "title", "slug", "type", "translation_key", "children", "course"], [
"children",
"course",
],
) )
@ -76,11 +82,6 @@ class Topic(Page):
return get_it_serializer_class( return get_it_serializer_class(
cls, cls,
field_names=[ field_names=[
"id",
"title",
"slug",
"type",
"translation_key",
"is_visible", "is_visible",
], ],
) )
@ -143,11 +144,6 @@ class Circle(Page):
return get_it_serializer_class( return get_it_serializer_class(
cls, cls,
field_names=[ field_names=[
"id",
"title",
"slug",
"type",
"translation_key",
"children", "children",
"description", "description",
"job_situations", "job_situations",
@ -156,6 +152,10 @@ class Circle(Page):
], ],
) )
def get_frontend_url(self):
short_slug = self.slug.replace(f"{self.get_parent().slug}-circle-", "")
return f"{self.get_parent().specific.get_frontend_url()}/{short_slug}"
def full_clean(self, *args, **kwargs): def full_clean(self, *args, **kwargs):
self.slug = find_slug_with_parent_prefix(self, "circle") self.slug = find_slug_with_parent_prefix(self, "circle")
super(Circle, self).full_clean(*args, **kwargs) super(Circle, self).full_clean(*args, **kwargs)
@ -185,9 +185,7 @@ class LearningSequence(Page):
@classmethod @classmethod
def get_serializer_class(cls): def get_serializer_class(cls):
return get_it_serializer_class( return get_it_serializer_class(cls, field_names=["icon"])
cls, field_names=["id", "title", "slug", "type", "translation_key", "icon"]
)
def get_admin_display_title(self): def get_admin_display_title(self):
return f"{self.icon} {self.draft_title}" return f"{self.icon} {self.draft_title}"
@ -203,6 +201,10 @@ class LearningSequence(Page):
self.slug = find_slug_with_parent_prefix(self, "ls") self.slug = find_slug_with_parent_prefix(self, "ls")
super(LearningSequence, self).full_clean(*args, **kwargs) super(LearningSequence, self).full_clean(*args, **kwargs)
def get_frontend_url(self):
short_slug = self.slug.replace(f"{self.get_parent().slug}-", "")
return f"{self.get_parent().specific.get_frontend_url()}#{short_slug}"
class LearningUnit(Page): class LearningUnit(Page):
parent_page_types = ["learnpath.Circle"] parent_page_types = ["learnpath.Circle"]
@ -240,6 +242,10 @@ class LearningUnit(Page):
) )
super(LearningUnit, self).full_clean(*args, **kwargs) super(LearningUnit, self).full_clean(*args, **kwargs)
def get_frontend_url(self):
short_slug = self.slug.replace(f"{self.get_parent().slug}-lu-", "")
return f"{self.get_parent().specific.get_frontend_url()}/evaluate/{short_slug}"
@classmethod @classmethod
def get_serializer_class(cls): def get_serializer_class(cls):
from vbv_lernwelt.learnpath.serializers import LearningUnitSerializer from vbv_lernwelt.learnpath.serializers import LearningUnitSerializer
@ -298,6 +304,10 @@ class LearningContent(Page):
class Meta: class Meta:
verbose_name = "Learning Content" verbose_name = "Learning Content"
def get_frontend_url(self):
short_slug = self.slug.replace(f"{self.get_parent().slug}-lc-", "")
return f"{self.get_parent().specific.get_frontend_url()}/{short_slug}"
def full_clean(self, *args, **kwargs): def full_clean(self, *args, **kwargs):
self.slug = find_slug_with_parent_prefix(self, "lc") self.slug = find_slug_with_parent_prefix(self, "lc")
super(LearningContent, self).full_clean(*args, **kwargs) super(LearningContent, self).full_clean(*args, **kwargs)
@ -307,11 +317,6 @@ class LearningContent(Page):
return get_it_serializer_class( return get_it_serializer_class(
cls, cls,
field_names=[ field_names=[
"id",
"title",
"slug",
"type",
"translation_key",
"minutes", "minutes",
"contents", "contents",
], ],

19
server/vbv_lernwelt/learnpath/serializer_helpers.py
View File

@ -7,8 +7,19 @@ from vbv_lernwelt.learnpath.utils import get_wagtail_type
def get_it_serializer_class(model, field_names): def get_it_serializer_class(model, field_names):
base_field_names = [
"id",
"title",
"slug",
"type",
"translation_key",
"frontend_url",
]
return wagtail_serializers.get_serializer_class( return wagtail_serializers.get_serializer_class(
model, field_names=field_names, meta_fields=[], base=ItBaseSerializer model,
field_names=base_field_names + field_names,
meta_fields=[],
base=ItBaseSerializer,
) )
@ -23,6 +34,7 @@ class ItBaseSerializer(wagtail_serializers.BaseSerializer):
children = SerializerMethodField() children = SerializerMethodField()
course = SerializerMethodField() course = SerializerMethodField()
course_category = CourseCategorySerializer(read_only=True) course_category = CourseCategorySerializer(read_only=True)
frontend_url = SerializerMethodField()
meta_fields = [] meta_fields = []
@ -50,6 +62,11 @@ class ItBaseSerializer(wagtail_serializers.BaseSerializer):
return CourseSerializer(course_parent_page.specific.course).data return CourseSerializer(course_parent_page.specific.course).data
return "" return ""
def get_frontend_url(self, obj):
if hasattr(obj, "get_frontend_url"):
return obj.get_frontend_url()
return ""
def _get_descendants(pages, obj): def _get_descendants(pages, obj):
return [c for c in pages if c.path.startswith(obj.path) and c.depth >= obj.depth] return [c for c in pages if c.path.startswith(obj.path) and c.depth >= obj.depth]

5
server/vbv_lernwelt/learnpath/serializers.py
View File

@ -9,11 +9,6 @@ class LearningUnitSerializer(
get_it_serializer_class( get_it_serializer_class(
LearningUnit, LearningUnit,
[ [
"id",
"title",
"slug",
"type",
"translation_key",
"course_category", "course_category",
"children", "children",
], ],

6
server/vbv_lernwelt/media_library/create_default_media_library.py
View File

@ -4,15 +4,15 @@ from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID
from vbv_lernwelt.course.models import Course, CoursePage from vbv_lernwelt.course.models import Course, CoursePage
from vbv_lernwelt.media_library.tests.media_library_factories import ( from vbv_lernwelt.media_library.tests.media_library_factories import (
create_external_link_block, create_external_link_block,
create_internal_link_block,
create_learn_media_block, create_learn_media_block,
create_media_collection, create_media_collection,
create_relative_link_block,
ExternalLinkBlockFactory, ExternalLinkBlockFactory,
InternalLinkBlockFactory,
LearnMediaBlockFactory, LearnMediaBlockFactory,
MediaCategoryPageFactory, MediaCategoryPageFactory,
MediaLibraryPageFactory, MediaLibraryPageFactory,
create_internal_link_block,
InternalLinkBlockFactory,
create_relative_link_block,
RelativeLinkBlockFactory, RelativeLinkBlockFactory,
) )

408
server/vbv_lernwelt/media_library/migrations/0001_initial.py
View File

@ -1,13 +1,13 @@
# Generated by Django 3.2.13 on 2022-10-03 14:18 # Generated by Django 3.2.13 on 2022-10-03 14:18
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import taggit.managers import taggit.managers
import wagtail.blocks import wagtail.blocks
import wagtail.fields import wagtail.fields
import wagtail.models.collections import wagtail.models.collections
import wagtail.search.index import wagtail.search.index
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -15,61 +15,395 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
('course', '0001_initial'), ("course", "0001_initial"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('taggit', '0004_alter_taggeditem_content_type_alter_taggeditem_tag'), ("taggit", "0004_alter_taggeditem_content_type_alter_taggeditem_tag"),
('wagtailcore', '0069_log_entry_jsonfield'), ("wagtailcore", "0069_log_entry_jsonfield"),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='MediaLibraryPage', name="MediaLibraryPage",
fields=[ fields=[
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), (
"page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
], ],
options={ options={
'abstract': False, "abstract": False,
}, },
bases=('wagtailcore.page',), bases=("wagtailcore.page",),
), ),
migrations.CreateModel( migrations.CreateModel(
name='MediaCategoryPage', name="MediaCategoryPage",
fields=[ fields=[
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), (
('introduction_text', models.TextField(default='')), "page_ptr",
('description_title', models.TextField(default='Das erwartet dich in diesem Handlungsfeld')), models.OneToOneField(
('description_text', models.TextField(default='')), auto_created=True,
('items', wagtail.fields.StreamField([('item', wagtail.blocks.TextBlock())], use_json_field=True)), on_delete=django.db.models.deletion.CASCADE,
('overview_icon', models.CharField(default='icon-hf-fahrzeug', max_length=255)), parent_link=True,
('body', wagtail.fields.StreamField([('content_collection', wagtail.blocks.StructBlock([('title', wagtail.blocks.TextBlock()), ('contents', wagtail.blocks.StreamBlock([('learn_media', wagtail.blocks.StructBlock([('title', wagtail.blocks.TextBlock(blank=False, null=False)), ('description', wagtail.blocks.TextBlock(default='', required=False)), ('icon_url', wagtail.blocks.TextBlock(default='', required=False)), ('link_display_text', wagtail.blocks.CharBlock(default='Link öffnen', max_length=255)), ('url', wagtail.blocks.TextBlock(default='', required=False)), ('open_window', wagtail.blocks.BooleanBlock(default=False)), ('page', wagtail.blocks.PageChooserBlock(page_type=['learnpath.LearningContent'], required=False))])), ('external_link', wagtail.blocks.StructBlock([('title', wagtail.blocks.TextBlock(blank=False, null=False)), ('description', wagtail.blocks.TextBlock(default='', required=False)), ('icon_url', wagtail.blocks.TextBlock(default='', required=False)), ('link_display_text', wagtail.blocks.CharBlock(default='Link öffnen', max_length=255)), ('url', wagtail.blocks.TextBlock(default='', required=False)), ('open_window', wagtail.blocks.BooleanBlock(default=False)), ('page', wagtail.blocks.PageChooserBlock(page_type=['learnpath.LearningContent'], required=False))])), ('internal_link', wagtail.blocks.StructBlock([('title', wagtail.blocks.TextBlock(blank=False, null=False)), ('description', wagtail.blocks.TextBlock(default='', required=False)), ('icon_url', wagtail.blocks.TextBlock(default='', required=False)), ('link_display_text', wagtail.blocks.CharBlock(default='Link öffnen', max_length=255)), ('url', wagtail.blocks.TextBlock(default='', required=False)), ('open_window', wagtail.blocks.BooleanBlock(default=False)), ('page', wagtail.blocks.PageChooserBlock(page_type=['learnpath.LearningContent'], required=False))])), ('relative_link', wagtail.blocks.StructBlock([('title', wagtail.blocks.TextBlock(blank=False, null=False)), ('description', wagtail.blocks.TextBlock(default='', required=False)), ('icon_url', wagtail.blocks.TextBlock(default='', required=False)), ('link_display_text', wagtail.blocks.CharBlock(default='Link öffnen', max_length=255)), ('url', wagtail.blocks.TextBlock(default='', required=False)), ('open_window', wagtail.blocks.BooleanBlock(default=False)), ('page', wagtail.blocks.PageChooserBlock(page_type=['learnpath.LearningContent'], required=False))]))]))]))], null=True, use_json_field=True)), primary_key=True,
('course_category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='course.coursecategory')), serialize=False,
to="wagtailcore.page",
),
),
("introduction_text", models.TextField(default="")),
(
"description_title",
models.TextField(
default="Das erwartet dich in diesem Handlungsfeld"
),
),
("description_text", models.TextField(default="")),
(
"items",
wagtail.fields.StreamField(
[("item", wagtail.blocks.TextBlock())], use_json_field=True
),
),
(
"overview_icon",
models.CharField(default="icon-hf-fahrzeug", max_length=255),
),
(
"body",
wagtail.fields.StreamField(
[
(
"content_collection",
wagtail.blocks.StructBlock(
[
("title", wagtail.blocks.TextBlock()),
(
"contents",
wagtail.blocks.StreamBlock(
[
(
"learn_media",
wagtail.blocks.StructBlock(
[
(
"title",
wagtail.blocks.TextBlock(
blank=False,
null=False,
),
),
(
"description",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"icon_url",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"link_display_text",
wagtail.blocks.CharBlock(
default="Link öffnen",
max_length=255,
),
),
(
"url",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"open_window",
wagtail.blocks.BooleanBlock(
default=False
),
),
(
"page",
wagtail.blocks.PageChooserBlock(
page_type=[
"learnpath.LearningContent"
],
required=False,
),
),
]
),
),
(
"external_link",
wagtail.blocks.StructBlock(
[
(
"title",
wagtail.blocks.TextBlock(
blank=False,
null=False,
),
),
(
"description",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"icon_url",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"link_display_text",
wagtail.blocks.CharBlock(
default="Link öffnen",
max_length=255,
),
),
(
"url",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"open_window",
wagtail.blocks.BooleanBlock(
default=False
),
),
(
"page",
wagtail.blocks.PageChooserBlock(
page_type=[
"learnpath.LearningContent"
],
required=False,
),
),
]
),
),
(
"internal_link",
wagtail.blocks.StructBlock(
[
(
"title",
wagtail.blocks.TextBlock(
blank=False,
null=False,
),
),
(
"description",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"icon_url",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"link_display_text",
wagtail.blocks.CharBlock(
default="Link öffnen",
max_length=255,
),
),
(
"url",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"open_window",
wagtail.blocks.BooleanBlock(
default=False
),
),
(
"page",
wagtail.blocks.PageChooserBlock(
page_type=[
"learnpath.LearningContent"
],
required=False,
),
),
]
),
),
(
"relative_link",
wagtail.blocks.StructBlock(
[
(
"title",
wagtail.blocks.TextBlock(
blank=False,
null=False,
),
),
(
"description",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"icon_url",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"link_display_text",
wagtail.blocks.CharBlock(
default="Link öffnen",
max_length=255,
),
),
(
"url",
wagtail.blocks.TextBlock(
default="",
required=False,
),
),
(
"open_window",
wagtail.blocks.BooleanBlock(
default=False
),
),
(
"page",
wagtail.blocks.PageChooserBlock(
page_type=[
"learnpath.LearningContent"
],
required=False,
),
),
]
),
),
]
),
),
]
),
)
],
null=True,
use_json_field=True,
),
),
(
"course_category",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to="course.coursecategory",
),
),
], ],
options={ options={
'abstract': False, "abstract": False,
}, },
bases=('wagtailcore.page',), bases=("wagtailcore.page",),
), ),
migrations.CreateModel( migrations.CreateModel(
name='LibraryDocument', name="LibraryDocument",
fields=[ fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), (
('title', models.CharField(max_length=255, verbose_name='title')), "id",
('file', models.FileField(upload_to='documents', verbose_name='file')), models.BigAutoField(
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')), auto_created=True,
('file_size', models.PositiveIntegerField(editable=False, null=True)), primary_key=True,
('file_hash', models.CharField(blank=True, editable=False, max_length=40)), serialize=False,
('display_text', models.CharField(default='', max_length=1024)), verbose_name="ID",
('description', models.TextField(default='')), ),
('link_display_text', models.CharField(default='', max_length=1024)), ),
('thumbnail', models.URLField()), ("title", models.CharField(max_length=255, verbose_name="title")),
('collection', models.ForeignKey(default=wagtail.models.collections.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.collection', verbose_name='collection')), ("file", models.FileField(upload_to="documents", verbose_name="file")),
('tags', taggit.managers.TaggableManager(blank=True, help_text=None, through='taggit.TaggedItem', to='taggit.Tag', verbose_name='tags')), (
('uploaded_by_user', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user')), "created_at",
models.DateTimeField(auto_now_add=True, verbose_name="created at"),
),
("file_size", models.PositiveIntegerField(editable=False, null=True)),
(
"file_hash",
models.CharField(blank=True, editable=False, max_length=40),
),
("display_text", models.CharField(default="", max_length=1024)),
("description", models.TextField(default="")),
("link_display_text", models.CharField(default="", max_length=1024)),
("thumbnail", models.URLField()),
(
"collection",
models.ForeignKey(
default=wagtail.models.collections.get_root_collection_id,
on_delete=django.db.models.deletion.CASCADE,
related_name="+",
to="wagtailcore.collection",
verbose_name="collection",
),
),
(
"tags",
taggit.managers.TaggableManager(
blank=True,
help_text=None,
through="taggit.TaggedItem",
to="taggit.Tag",
verbose_name="tags",
),
),
(
"uploaded_by_user",
models.ForeignKey(
blank=True,
editable=False,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to=settings.AUTH_USER_MODEL,
verbose_name="uploaded by user",
),
),
], ],
options={ options={
'verbose_name': 'document', "verbose_name": "document",
'verbose_name_plural': 'documents', "verbose_name_plural": "documents",
'abstract': False, "abstract": False,
}, },
bases=(wagtail.search.index.Indexed, models.Model), bases=(wagtail.search.index.Indexed, models.Model),
), ),

19
server/vbv_lernwelt/media_library/models.py
View File

@ -25,16 +25,14 @@ class MediaLibraryPage(Page):
) )
super(MediaLibraryPage, self).full_clean(*args, **kwargs) super(MediaLibraryPage, self).full_clean(*args, **kwargs)
def get_frontend_url(self):
return f"/media/{self.slug}"
@classmethod @classmethod
def get_serializer_class(cls): def get_serializer_class(cls):
return get_it_serializer_class( return get_it_serializer_class(
cls, cls,
[ [
"id",
"title",
"slug",
"type",
"translation_key",
"course", "course",
"children", "children",
], ],
@ -82,20 +80,19 @@ class MediaCategoryPage(Page):
def full_clean(self, *args, **kwargs): def full_clean(self, *args, **kwargs):
self.slug = find_available_slug( self.slug = find_available_slug(
slugify(f"{self.get_parent()}-cat-{self.title}", allow_unicode=True) slugify(f"{self.get_parent().slug}-cat-{self.title}", allow_unicode=True)
) )
super(MediaCategoryPage, self).full_clean(*args, **kwargs) super(MediaCategoryPage, self).full_clean(*args, **kwargs)
def get_frontend_url(self):
short_slug = self.slug.replace(f"{self.get_parent().slug}-cat-", "")
return f"{self.get_parent().specific.get_frontend_url()}/handlungsfelder/{short_slug}"
@classmethod @classmethod
def get_serializer_class(cls): def get_serializer_class(cls):
return get_it_serializer_class( return get_it_serializer_class(
cls, cls,
field_names=[ field_names=[
"id",
"title",
"slug",
"type",
"translation_key",
"course_category", "course_category",
"introduction_text", "introduction_text",
"overview_icon", "overview_icon",

2
server/vbv_lernwelt/media_library/tests/media_library_factories.py
View File

@ -4,8 +4,8 @@ import wagtail_factories
from vbv_lernwelt.media_library.content_blocks import ( from vbv_lernwelt.media_library.content_blocks import (
ExternalLinkBlock, ExternalLinkBlock,
LearnMediaBlock,
InternalLinkBlock, InternalLinkBlock,
LearnMediaBlock,
RelativeLinkBlock, RelativeLinkBlock,
) )
from vbv_lernwelt.media_library.models import ( from vbv_lernwelt.media_library.models import (