From 53285a0d19eb503aa46bb1381bff0eceec59c5a2 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 14 Oct 2024 19:17:32 +0530 Subject: [PATCH 1/3] fix: misc issues --- frontend/src/components/Controls/MultiSelect.vue | 15 +-------------- frontend/src/pages/Lesson.vue | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/Controls/MultiSelect.vue b/frontend/src/components/Controls/MultiSelect.vue index f1281eb7c..aefd8bb0c 100644 --- a/frontend/src/components/Controls/MultiSelect.vue +++ b/frontend/src/components/Controls/MultiSelect.vue @@ -152,24 +152,11 @@ const filterOptions = createResource({ url: 'frappe.desk.search.search_link', method: 'POST', cache: [text.value, props.doctype], + auto: true, params: { txt: text.value, doctype: props.doctype, }, - /* transform: (data) => { - let allData = data - .filter((c) => { - return c.description.split(', ')[1] - }) - .map((option) => { - let email = option.description.split(', ')[1] - return { - label: option.label || email, - value: email, - } - }) - return allData - }, */ }) const options = computed(() => { diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue index 800cf1bf8..b8f6373e8 100644 --- a/frontend/src/pages/Lesson.vue +++ b/frontend/src/pages/Lesson.vue @@ -279,7 +279,7 @@ const renderEditor = (holder, content) => { } const markProgress = () => { - if (user.data && !lesson.data?.progress) { + if (user.data && lesson.data && !lesson.data.progress) { progress.submit() } } diff --git a/package.json b/package.json index f5231fac1..923d2f3ec 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "frappe_lms", "version": "1.0.0", "description": "Easy to use, open-source, Learning Management System", - "workspaces1": [ + "workspaces": [ "frappe-ui", "frontend" ], From 2442f35f5600a9c9fadb4a3d87470f6c3bc2b280 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 23 Oct 2024 10:35:26 +0530 Subject: [PATCH 2/3] fix: added is_instructor to jinja --- lms/hooks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/hooks.py b/lms/hooks.py index 5ea70680a..b30a6c458 100644 --- a/lms/hooks.py +++ b/lms/hooks.py @@ -185,6 +185,7 @@ "lms.lms.utils.get_lesson_url", "lms.page_renderers.get_profile_url", "lms.overrides.user.get_palette", + "lms.lms.utils.is_instructor", ], "filters": [], } From a085050d27dc33c4c0625e2a2705c3d16521fe30 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 23 Oct 2024 10:36:26 +0530 Subject: [PATCH 3/3] build: removed frappe-ui package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 923d2f3ec..f5231fac1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "frappe_lms", "version": "1.0.0", "description": "Easy to use, open-source, Learning Management System", - "workspaces": [ + "workspaces1": [ "frappe-ui", "frontend" ],