fix: conflicts

2021-10-24 12:03:06 +05:30
parent f5af07086b
commit 050cfa494c
23 changed files with 478 additions and 154 deletions
--- a/school/www/profiles/profile.html
+++ b/school/www/profiles/profile.html
@@ -130,9 +130,8 @@
    Courses Mentored
  </div>
  <div class="cards-parent">
-    {% for mentorship in member.get_mentored_courses() %}
-    {% set course_details = frappe.get_doc("LMS Course", mentorship.course) %}
-    {{ widgets.CourseCard(course=course_details, read_only=read_only) }}
+    {% for course in member.get_mentored_courses() %}
+    {{ widgets.CourseCard(course=course, read_only=read_only) }}
    {% endfor %}
  </div>
 </div>