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

Add basic knowledge page to content block

This commit is contained in:
Ramon Wenger 2018-10-25 13:54:49 +02:00
parent aea8beff49
commit 106d90ed17
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/components/content-blocks/BasicKnowledgeWidget.vue
View File

@ -1,13 +1,20 @@
<template> <template>
<div class="basic-knowledge-widget"> <div class="basic-knowledge-widget">
<div class="basic-knowledge-widget__description" v-html="value.description"></div> <div class="basic-knowledge-widget__description" v-html="value.description"></div>
<router-link class="basic-knowledge-widget__button button" tag="button" to="/basic-knowledge">Basiswissen lesen</router-link> <router-link class="basic-knowledge-widget__button button" tag="button"
:to="{name: 'basic-knowledge', params: { slug: value.slug }}">Basiswissen lesen
</router-link>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props: ['value'] props: ['value'],
computed: {
slug() {
return `/basic-knowledge/${this.value.slug}`
}
}
} }
</script> </script>

32
server/api/graphene_wagtail.py
View File

@ -8,6 +8,7 @@ from wagtail.core.fields import StreamField
from wagtail.images.models import Image from wagtail.images.models import Image
from assignments.models import Assignment from assignments.models import Assignment
from basicknowledge.models import BasicKnowledge
class GenericStreamFieldType(Scalar): class GenericStreamFieldType(Scalar):
@ -35,20 +36,27 @@ class GenericStreamFieldType(Scalar):
'id': to_global_id('AssignmentNode', assignment.pk) 'id': to_global_id('AssignmentNode', assignment.pk)
} }
d['value'] = value d['value'] = value
if _type == 'basic_knowledge':
_value = d['value']
basic_knowledge = BasicKnowledge.objects.get(pk=_value['basic_knowledge'])
_value.update({
'slug': basic_knowledge.slug
})
d['value'] = _value
# value = dict(d['value']) # value = dict(d['value'])
# if 'document' in value: # if 'document' in value:
# value['document'] = Document.objects.get(id=value['document']).file.url # value['document'] = Document.objects.get(id=value['document']).file.url
# if 'image' in value: # if 'image' in value:
# value['image'] = Image.objects.get(id=value['image']).file.url # value['image'] = Image.objects.get(id=value['image']).file.url
# else: # else:
# _type = d[0] # _type = d[0]
# value = dict(d[1]) # value = dict(d[1])
# if 'document' in value: # if 'document' in value:
# value['document'] = value['document'].file.url # value['document'] = value['document'].file.url
# if 'image' in value: # if 'image' in value:
# value['image'] = value['image'].file.url # value['image'] = value['image'].file.url
return stream_data return stream_data

2
server/books/blocks.py
View File

@ -26,7 +26,7 @@ class BasicKnowledgeBlock(blocks.StructBlock):
icon = 'placeholder' icon = 'placeholder'
description = blocks.RichTextBlock() description = blocks.RichTextBlock()
url = blocks.URLBlock() basic_knowledge = blocks.PageChooserBlock(required=True, target_model='basicknowledge.BasicKnowledge')
# 'image_url' # 'image_url'