Skip to content

Commit

Permalink
Merge pull request #208 from RitvikSardana/develop-ritvik-version-bump
Browse files Browse the repository at this point in the history
fix: version bump
  • Loading branch information
RitvikSardana authored Feb 23, 2024
2 parents d055a30 + b4bc4ad commit 64a028f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion education/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "15.1.0"
__version__ = "15.2.1"
8 changes: 7 additions & 1 deletion education/education/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,13 @@ def update_email_group(doctype, name):

@frappe.whitelist()
def get_current_enrollment(student, academic_year=None):
current_academic_year = academic_year or frappe.defaults.get_defaults().academic_year
current_academic_year = (
academic_year
or frappe.defaults.get_defaults().academic_year
or frappe.get_all("Academic Year", pluck="name")[0]
)
if not current_academic_year:
frappe.throw(_("Please set default Academic Year in Education Settings"))
program_enrollment_list = frappe.db.sql(
"""
select
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/stores/student.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ export const studentStore = defineStore('education-student', () => {
delete info.student_groups
studentInfo.value = info
},
onError(err) {
console.error(err)
}
})

// const s = createDocumentResource({
Expand Down

0 comments on commit 64a028f

Please sign in to comment.