Merge branch 'develop' of https://github.com/frappe/lms into open-to-work

This commit is contained in:
Jannat Patel
2025-12-16 20:37:38 +05:30
4 changed files with 5 additions and 4 deletions

View File

@@ -90,7 +90,7 @@
v-model="currentCategory"
:options="categories"
:placeholder="__('Category')"
@change="updateBatches()"
@update:modelValue="updateBatches()"
/>
</div>
</div>

View File

@@ -75,7 +75,7 @@
v-model="currentCategory"
:options="categories"
:placeholder="__('Category')"
@change="updateCourses()"
@update:modelValue="updateCourses()"
/>
</div>
</div>

View File

@@ -74,7 +74,7 @@ const isAdmin = computed(() => {
})
const myLiveClasses = createResource({
url: 'lms.lms.utils.get_my_live_classes',
url: 'lms.lms.api.get_my_live_classes',
auto: !isAdmin.value ? true : false,
})

View File

@@ -319,7 +319,7 @@
</div>
</div>
<InlineLessonMenu
v-if="lesson.data"
v-if="lesson.data?.name"
v-model="showInlineMenu"
:lesson="lesson.data?.name"
v-model:notes="notes"
@@ -732,6 +732,7 @@ const updateVideoTime = (video) => {
}
const startTimer = () => {
if (!lesson.data?.membership) return
let timerInterval = setInterval(() => {
timer.value++
if (timer.value == 30) {