chore: resolved conflicts
This commit is contained in:
@@ -486,11 +486,6 @@
|
||||
|
||||
frappe.boot.single_types = []
|
||||
|
||||
frappe.router = {
|
||||
slug (name) {
|
||||
return name.toLowerCase().replace(/ /g, "-");
|
||||
}
|
||||
}
|
||||
let class_info = {{ class_info | json }};
|
||||
</script>
|
||||
{% endif %}
|
||||
|
||||
@@ -157,12 +157,6 @@
|
||||
"can_select": ["LMS Category"],
|
||||
"can_read": ["LMS Category"]
|
||||
};
|
||||
|
||||
frappe.router = {
|
||||
slug (name) {
|
||||
return name.toLowerCase().replace(/ /g, "-");
|
||||
}
|
||||
}
|
||||
let class_info = null;
|
||||
</script>
|
||||
{% endif %}
|
||||
|
||||
@@ -36,7 +36,7 @@ def get_context(context):
|
||||
context.assessments = get_assessments(class_name, context.student.name)
|
||||
|
||||
upcoming_evals = frappe.get_all(
|
||||
"LMS certificate Request",
|
||||
"LMS Certificate Request",
|
||||
{
|
||||
"member": context.student.name,
|
||||
"course": ["in", context.courses],
|
||||
|
||||
Reference in New Issue
Block a user