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.

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

Merge main into dev #1532

Merged
merged 6 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
{"slug": "delete_calendly_organization", "description": "Delete calendly integration"},
{"slug": "crud_assessment", "description": "Manage student quizzes and assessments"},
{"slug": "read_user_assessment", "description": "Read user assessment submissions"},
{"slug": "read_talent_pipeline", "description": "Read users from the talent pipeline"},
{"slug": "read_subscription", "description": "Read subscriptions and plan financings of other users"},
{
"slug": "crud_subscription",
Expand Down Expand Up @@ -419,6 +420,7 @@ def extend_roles(roles: list[RoleType]) -> None:
"classroom_activity",
"read_asset",
"task_delivery_details",
"read_talent_pipeline",
],
}
)
Expand Down
4 changes: 2 additions & 2 deletions breathecode/feedback/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"lowest": "mala",
},
"button_label": "Responder",
"survey_subject": "¿Cómo ha sido tu experiencia en 4Geeks hasta este momento?",
"survey_subject": "Necesitamos tu feedback",
"survey_message": "Por favor toma 5 minutos para enviarnos un feedback sobre tu experiencia en la academia hasta ahora",
},
"en": {
Expand Down Expand Up @@ -66,7 +66,7 @@
"lowest": "not good",
},
"button_label": "Answer the question",
"survey_subject": "How has been your experience at 4Geeks so far?",
"survey_subject": "We need your feedback",
"survey_message": "Please take 5 minutes to give us feedback about your experience at the academy so far.",
},
}
5 changes: 3 additions & 2 deletions breathecode/registry/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,9 @@ def process_asset_config(asset, config):
asset.with_solutions = True
asset.with_video = True

if "agent" in config:
asset.agent = config["agent"]
if "editor" in config:
if "agent" in config["editor"]:
asset.agent = config["editor"]["agent"]

if "solution" in config:
asset.with_solutions = True
Expand Down
1 change: 1 addition & 0 deletions breathecode/registry/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@ def to_value(self, instance):

class AssetTechnologySerializer(ParentAssetTechnologySerializer):
parent = ParentAssetTechnologySerializer(required=False)
sort_priority = serpy.Field()
lang = serpy.Field(required=False)


Expand Down
1 change: 1 addition & 0 deletions breathecode/registry/tests/urls/v1/tests_technology.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def get_serializer(asset_technology, assets=[], asset_technologies=[]):
"slug": asset_technology.slug,
"title": asset_technology.title,
"visibility": asset_technology.visibility,
"sort_priority": asset_technology.sort_priority,
}


Expand Down
Loading