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

Backport more wagtail code

This commit is contained in:
Ramon Wenger 2022-01-25 16:18:25 +01:00
parent a1f6bfc373
commit 5b105958e2
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/graphql/gql/public-client/betaLogin.gql
View File

@ -4,3 +4,4 @@ mutation BetaLogin($input: BetaLoginInput!) {
message
}
}

4
server/api/graphene_wagtail.py
View File

@ -18,7 +18,9 @@ logger = logging.getLogger(__name__)
class GenericStreamFieldType(Scalar):
@staticmethod
def serialize(stream_value):
raw_data = stream_value.raw_data
# todo: @django3-update
#raw_data = stream_value.raw_data
raw_data = stream_value.stream_data
return list(augment_fields(raw_data))

8
server/books/schema/nodes/content.py
View File

@ -57,7 +57,9 @@ class ContentBlockNode(DjangoObjectType, HiddenAndVisibleForMixin):
def resolve_contents(self, info, **kwargs):
updated_raw_data = []
for content in self.contents.raw_data:
# todo: @django3-update
#for content in self.contents.raw_data:
for content in self.contents.stream_data:
# only show solutions to teachers and students for whom their teachers have them enabled
if is_solution_and_hidden_for_user(content['type'], info.context.user, self.module):
logger.debug('Solution is hidden for this user')
@ -70,7 +72,9 @@ class ContentBlockNode(DjangoObjectType, HiddenAndVisibleForMixin):
content = process_module_room_slug_block(content)
updated_raw_data.append(content)
self.contents.raw_data = updated_raw_data
# todo: @django3-update
#self.contents.raw_data = updated_raw_data
self.contents.stream_data = updated_raw_data
return self.contents
def resolve_bookmarks(self, info, **kwargs):

7
server/rooms/wagtail_hooks.py
View File

@ -28,8 +28,11 @@ def do_after_page_edit(request, page):
def get_room_blocks(page):
top_level_module_room_slug_blocks = get_block_from_raw_data(page.contents.raw_data, 'module_room_slug')
content_list_module_room_slug_blocks = get_admin_slugs_from_content_list(page.contents.raw_data)
# todo: @django3-update
#top_level_module_room_slug_blocks = get_block_from_raw_data(page.contents.raw_data, 'module_room_slug')
#content_list_module_room_slug_blocks = get_admin_slugs_from_content_list(page.contents.raw_data)
top_level_module_room_slug_blocks = get_block_from_raw_data(page.contents.stream_data, 'module_room_slug')
content_list_module_room_slug_blocks = get_admin_slugs_from_content_list(page.contents.stream_data)
return top_level_module_room_slug_blocks + content_list_module_room_slug_blocks