Skip to content

Commit 0a9b18d

Browse files
authored
Merge pull request #1928 from pateljannat/issues-164
fix: misc issues
2 parents 115d527 + 3013372 commit 0a9b18d

5 files changed

Lines changed: 16 additions & 6 deletions

File tree

frontend/src/pages/JobDetail.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ const job = createResource({
196196
onSuccess: (data) => {
197197
if (user.data?.name) {
198198
jobApplication.submit()
199+
applicationCount.submit()
199200
}
200-
applicationCount.submit()
201201
},
202202
})
203203

lms/lms/doctype/course_evaluator/test_course_evaluator.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ def test_schedule_dates(self):
4343

4444
def calculated_first_date_of_schedule(self):
4545
today = getdate()
46-
offset = (0 - today.weekday() + 7) % 7 # 0 for Monday
47-
first_date = add_days(today, offset)
46+
offset_monday = (0 - today.weekday() + 7) % 7 # 0 for Monday
47+
offset_wednesday = (2 - today.weekday() + 7) % 7 # 2 for Wednesday
48+
if offset_monday < offset_wednesday:
49+
first_date = add_days(today, offset_monday)
50+
else:
51+
first_date = add_days(today, offset_wednesday)
4852
return first_date
4953

5054
def calculated_last_date_of_schedule(self, first_date):

lms/lms/doctype/lms_enrollment/lms_enrollment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def validate_course_enrollment_eligibility(self):
3939
"reference_doctype": "LMS Course",
4040
"reference_docname": self.course,
4141
"member": self.member,
42-
"payment_receipt": True,
42+
"payment_received": True,
4343
},
4444
)
4545

lms/lms/doctype/lms_settings/lms_settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
],
7777
"fields": [
7878
{
79+
"default": "https://falcon.frappe.io/",
7980
"fieldname": "livecode_url",
8081
"fieldtype": "Data",
8182
"label": "LiveCode URL"
@@ -451,7 +452,7 @@
451452
"index_web_pages_for_search": 1,
452453
"issingle": 1,
453454
"links": [],
454-
"modified": "2025-12-10 17:36:15.689695",
455+
"modified": "2025-12-22 11:30:13.868031",
455456
"modified_by": "sayali@frappe.io",
456457
"module": "LMS",
457458
"name": "LMS Settings",

lms/lms/utils.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1800,14 +1800,19 @@ def validate_enrollment_eligibility(batch_doc, payment_doc=None):
18001800
if not payment_doc or not payment_doc.payment_received:
18011801
frappe.throw(_("Payment is required to enroll in this batch."))
18021802

1803-
elif not batch_doc.allow_self_enrollment:
1803+
elif not batch_doc.allow_self_enrollment and not is_admin():
18041804
frappe.throw(_("Enrollment in this batch is restricted. Please contact the Administrator."))
18051805

18061806
students = frappe.db.count("LMS Batch Enrollment", {"batch": batch_doc.name})
18071807
if batch_doc.seat_count and students >= batch_doc.seat_count:
18081808
frappe.throw(_("There are no seats available in this batch."))
18091809

18101810

1811+
def is_admin():
1812+
roles = frappe.get_roles(frappe.session.user)
1813+
return "Course Creator" in roles or "Moderator" in roles or "Batch Evaluator" in roles
1814+
1815+
18111816
def create_enrollment(batch, payment_doc=None):
18121817
new_student = frappe.new_doc("LMS Batch Enrollment")
18131818
new_student.update(

0 commit comments

Comments
 (0)