Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly set admin_imported flag at import and deletion. #11254

Merged
merged 6 commits into from
Sep 26, 2023
Merged

Properly set admin_imported flag at import and deletion. #11254

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cc02bc
Don't use force deletion when cleaning up resources for content remov…
rtibbles Sep 15, 2023
ecee1be
Tweak which models to exclude from schema generation.
rtibbles Sep 15, 2023
804f581
Set the admin imported flag during resource import.
rtibbles Sep 15, 2023
eb2da96
Clean up admin imported flags, except in content request cleanups.
rtibbles Sep 15, 2023
0df01d0
Persist admin_imported flag across channel metadata upgrades.
rtibbles Sep 26, 2023
695c078
Add cautionary code comment.
rtibbles Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions kolibri/core/content/management/commands/importchannel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,37 @@ def progress_callback(bytes):
.exclude(kind=content_kinds.TOPIC)
.values_list("id", flat=True)
)
admin_imported_ids = list(
ContentNode.objects.filter(
channel_id=channel_id, available=True, admin_imported=True
)
.exclude(kind=content_kinds.TOPIC)
.values_list("id", flat=True)
)
not_admin_imported_ids = list(
ContentNode.objects.filter(
channel_id=channel_id, available=True, admin_imported=False
)
.exclude(kind=content_kinds.TOPIC)
.values_list("id", flat=True)
)
rtibbles marked this conversation as resolved.
Show resolved Hide resolved
import_ran = import_channel_by_id(
channel_id, self.is_cancelled, contentfolder
)
if import_ran:
if node_ids:
# annotate default channel db based on previously annotated leaf nodes
update_content_metadata(channel_id, node_ids=node_ids)
if admin_imported_ids:
# Reset admin_imported flag for nodes that were imported by admin
ContentNode.objects.filter_by_uuids(
admin_imported_ids
).update(admin_imported=True)
if not_admin_imported_ids:
# Reset admin_imported flag for nodes that were not imported by admin
ContentNode.objects.filter_by_uuids(
not_admin_imported_ids
).update(admin_imported=False)
else:
# ensure the channel is available to the frontend
ContentCacheKey.update_cache_key()
Expand Down