From 9fd59b5d38b33f88a10f4b2134ede0e169d4e3fa Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com> Date: Thu, 16 Sep 2021 15:59:32 +0530 Subject: [PATCH 1/9] fix: spell check in Validation Message Change unedrscore to underscore --- community/overrides/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/overrides/user.py b/community/overrides/user.py index 780400f9..e53d5fca 100644 --- a/community/overrides/user.py +++ b/community/overrides/user.py @@ -39,7 +39,7 @@ class CustomUser(User): frappe.throw(_("Username already exists.")) if not re.match("^[A-Za-z0-9_]*$", self.username): - frappe.throw(_("Username can only contain alphabets, numbers and unedrscore.")) + frappe.throw(_("Username can only contain alphabets, numbers and underscore.")) if underscore_condition: frappe.throw(_("First and Last character of username cannot be Underscore(_).")) From 29855a0cbc543c6a3bf93369377b9f82c4c5de36 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Thu, 16 Sep 2021 18:04:03 +0530 Subject: [PATCH 2/9] fix: issues --- community/lms/widgets/Reviews.html | 20 +++++++++++++++----- community/public/css/style.css | 13 +++++++++---- community/templates/quiz.html | 2 +- community/www/batch/learn.js | 3 ++- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/community/lms/widgets/Reviews.html b/community/lms/widgets/Reviews.html index 8fe25df4..b0aecb4c 100644 --- a/community/lms/widgets/Reviews.html +++ b/community/lms/widgets/Reviews.html @@ -1,16 +1,15 @@ {% if not course.upcoming %}
{% set reviews = course.get_reviews() %} - {% if reviews | length or course.is_eligible_to_review(membership) %}
Reviews - {% if course.is_eligible_to_review(membership) %} + {% if course.is_eligible_to_review(membership) and reviews | length %} Write a review {% endif %}
- {% endif %} + {% if reviews | length %}
{% for review in reviews %} @@ -36,9 +35,20 @@
{% endfor %}
+ {% else %}
- No Reviews +
+ No Reviews +
+ There are no reviews for this course. +
+ {% if course.is_eligible_to_review(membership) %} + + Write a review + + {% endif %} +
{% endif %} @@ -48,7 +58,7 @@
-
Review
+
Write a Review
diff --git a/community/public/css/style.css b/community/public/css/style.css index 9372b350..d284f41d 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -330,6 +330,11 @@ input[type=checkbox] { .quiz-label { margin-bottom: 0; + cursor: pointer; +} + +.quiz-label p { + display: inline; } .course-card-wide { @@ -519,7 +524,7 @@ input[type=checkbox] { cursor: pointer; display: flex; align-items: center; - padding-bottom: 0.5rem; + padding-bottom: 1rem; } .chapter-description { @@ -637,7 +642,7 @@ input[type=checkbox] { .course-outline { flex-direction: column; - padding: 16px 12px 16px; + padding: 1rem 0.75rem 0; } .lessons { @@ -881,8 +886,8 @@ input[type=checkbox] { .question { flex-direction: column; - width: 688px; - margin: auto; + width: 85%; + margin: 0 auto; } .question p { diff --git a/community/templates/quiz.html b/community/templates/quiz.html index 58126fbc..a58fb4ea 100644 --- a/community/templates/quiz.html +++ b/community/templates/quiz.html @@ -29,8 +29,8 @@ data-correct="{{ question['is_correct_' + loop.index | string] }}" {% if question.multiple %} type="checkbox" {% else %} type="radio" name="{{ question.question | urlencode }}" {% endif %}> + {{ frappe.utils.md_to_html(option) }} - {{ frappe.utils.md_to_html(option) }}
{% set explanation = question['explanation_' + loop.index | string] %} diff --git a/community/www/batch/learn.js b/community/www/batch/learn.js index 326eedaa..00b489f1 100644 --- a/community/www/batch/learn.js +++ b/community/www/batch/learn.js @@ -169,7 +169,8 @@ var parse_options = () => { } var add_icon = (element, icon) => { - $(element).parent().empty().html(``); + var label = $(element).parent().find(".label-area p").text(); + $(element).parent().empty().html(` ${label}`); } var add_to_local_storage = (quiz_name, current_index, answer, is_correct) => { From e245af57a80dc67acb3b2f641190aed1d43418b6 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Sun, 19 Sep 2021 19:15:45 +0530 Subject: [PATCH 3/9] fix: regex change for username --- community/overrides/user.py | 6 ++++-- community/www/profiles/profile.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/community/overrides/user.py b/community/overrides/user.py index e53d5fca..c2786123 100644 --- a/community/overrides/user.py +++ b/community/overrides/user.py @@ -18,6 +18,8 @@ class CustomUser(User): else: underscore_condition = '' + regex = re.compile('[@!#$%^&*()<>?/\|}{~:-]') + if self.is_new(): if not self.username: self.username = self.get_username_from_first_name() @@ -25,7 +27,7 @@ class CustomUser(User): if self.username.find(" "): self.username.replace(" ", "") - if not re.match("^[A-Za-z0-9_]*$", self.username) or underscore_condition: + if regex.search(self.username) or underscore_condition: self.username = self.remove_illegal_characters() if len(self.username) < 4: @@ -38,7 +40,7 @@ class CustomUser(User): if not self.username: frappe.throw(_("Username already exists.")) - if not re.match("^[A-Za-z0-9_]*$", self.username): + if regex.search(self.username): frappe.throw(_("Username can only contain alphabets, numbers and underscore.")) if underscore_condition: diff --git a/community/www/profiles/profile.py b/community/www/profiles/profile.py index 73ea980f..25d8254a 100644 --- a/community/www/profiles/profile.py +++ b/community/www/profiles/profile.py @@ -1,5 +1,6 @@ import frappe from community.page_renderers import get_profile_url_prefix +from urllib.parse import urlencode def get_context(context): context.no_cache = 1 @@ -9,14 +10,15 @@ def get_context(context): except KeyError: username = frappe.db.get_value("User", frappe.session.user, ["username"]) if username: - frappe.local.flags.redirect_location = get_profile_url_prefix() + username + print(username) + frappe.local.flags.redirect_location = get_profile_url_prefix() + urlencode({"username": username}) raise frappe.Redirect try: context.member = frappe.get_doc("User", {"username": username}) except: context.template = "www/404.html" return - + print(context.member) context.profile_tabs = get_profile_tabs(context.member) def get_profile_tabs(user): From 64048a8a18a09ec37b7f320816ff7cff15b66aa4 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 20 Sep 2021 12:10:35 +0530 Subject: [PATCH 4/9] fix: minor issues --- community/lms/doctype/chapter/chapter.json | 6 ++++-- .../{chapters => chapter_reference}/__init__.py | 0 .../chapter_reference.json} | 2 +- .../chapter_reference.py} | 2 +- community/lms/doctype/lesson/lesson.json | 4 +++- .../doctype/{lessons => lesson_reference}/__init__.py | 0 .../lesson_reference.json} | 2 +- .../lesson_reference.py} | 2 +- community/lms/doctype/lms_course/lms_course.json | 9 +++++++-- community/lms/doctype/lms_course/lms_course.py | 4 ++-- community/lms/doctype/lms_quiz/lms_quiz.json | 4 +++- community/lms/widgets/ChapterTeaser.html | 11 ++++++++++- community/public/css/style.css | 4 ++++ community/public/node_modules | 1 + community/www/batch/learn.html | 11 +++++++++-- community/www/courses/index.py | 2 +- 16 files changed, 48 insertions(+), 16 deletions(-) rename community/lms/doctype/{chapters => chapter_reference}/__init__.py (100%) rename community/lms/doctype/{chapters/chapters.json => chapter_reference/chapter_reference.json} (95%) rename community/lms/doctype/{lessons/lessons.py => chapter_reference/chapter_reference.py} (83%) rename community/lms/doctype/{lessons => lesson_reference}/__init__.py (100%) rename community/lms/doctype/{lessons/lessons.json => lesson_reference/lesson_reference.json} (95%) rename community/lms/doctype/{chapters/chapters.py => lesson_reference/lesson_reference.py} (83%) create mode 120000 community/public/node_modules diff --git a/community/lms/doctype/chapter/chapter.json b/community/lms/doctype/chapter/chapter.json index 6a985a80..9bc525ed 100644 --- a/community/lms/doctype/chapter/chapter.json +++ b/community/lms/doctype/chapter/chapter.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_rename": 1, "autoname": "format:{####} {title}", "creation": "2021-05-03 05:49:08.383057", "doctype": "DocType", @@ -38,7 +39,7 @@ "fieldname": "lessons", "fieldtype": "Table", "label": "Lessons", - "options": "Lessons" + "options": "Lesson Reference" }, { "fieldname": "column_break_3", @@ -57,10 +58,11 @@ "link_fieldname": "chapter" } ], - "modified": "2021-08-31 10:43:45.866864", + "modified": "2021-09-20 10:58:47.241660", "modified_by": "Administrator", "module": "LMS", "name": "Chapter", + "naming_rule": "Expression", "owner": "Administrator", "permissions": [ { diff --git a/community/lms/doctype/chapters/__init__.py b/community/lms/doctype/chapter_reference/__init__.py similarity index 100% rename from community/lms/doctype/chapters/__init__.py rename to community/lms/doctype/chapter_reference/__init__.py diff --git a/community/lms/doctype/chapters/chapters.json b/community/lms/doctype/chapter_reference/chapter_reference.json similarity index 95% rename from community/lms/doctype/chapters/chapters.json rename to community/lms/doctype/chapter_reference/chapter_reference.json index 7ca73ed2..7c63fbcf 100644 --- a/community/lms/doctype/chapters/chapters.json +++ b/community/lms/doctype/chapter_reference/chapter_reference.json @@ -23,7 +23,7 @@ "modified": "2021-07-27 16:25:02.903245", "modified_by": "Administrator", "module": "LMS", - "name": "Chapters", + "name": "Chapter Reference", "owner": "Administrator", "permissions": [], "sort_field": "modified", diff --git a/community/lms/doctype/lessons/lessons.py b/community/lms/doctype/chapter_reference/chapter_reference.py similarity index 83% rename from community/lms/doctype/lessons/lessons.py rename to community/lms/doctype/chapter_reference/chapter_reference.py index 63370d40..73ca7b4f 100644 --- a/community/lms/doctype/lessons/lessons.py +++ b/community/lms/doctype/chapter_reference/chapter_reference.py @@ -4,5 +4,5 @@ # import frappe from frappe.model.document import Document -class Lessons(Document): +class ChapterReference(Document): pass diff --git a/community/lms/doctype/lesson/lesson.json b/community/lms/doctype/lesson/lesson.json index e8267c4f..84ca8120 100644 --- a/community/lms/doctype/lesson/lesson.json +++ b/community/lms/doctype/lesson/lesson.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_rename": 1, "autoname": "format:{####} {title}", "creation": "2021-05-03 06:21:12.995987", "doctype": "DocType", @@ -70,10 +71,11 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-31 10:44:14.168257", + "modified": "2021-09-20 10:52:29.116536", "modified_by": "Administrator", "module": "LMS", "name": "Lesson", + "naming_rule": "Expression", "owner": "Administrator", "permissions": [ { diff --git a/community/lms/doctype/lessons/__init__.py b/community/lms/doctype/lesson_reference/__init__.py similarity index 100% rename from community/lms/doctype/lessons/__init__.py rename to community/lms/doctype/lesson_reference/__init__.py diff --git a/community/lms/doctype/lessons/lessons.json b/community/lms/doctype/lesson_reference/lesson_reference.json similarity index 95% rename from community/lms/doctype/lessons/lessons.json rename to community/lms/doctype/lesson_reference/lesson_reference.json index b05f5b13..d7a0dc3a 100644 --- a/community/lms/doctype/lessons/lessons.json +++ b/community/lms/doctype/lesson_reference/lesson_reference.json @@ -23,7 +23,7 @@ "modified": "2021-08-31 10:44:42.048232", "modified_by": "Administrator", "module": "LMS", - "name": "Lessons", + "name": "Lesson Reference", "owner": "Administrator", "permissions": [], "sort_field": "modified", diff --git a/community/lms/doctype/chapters/chapters.py b/community/lms/doctype/lesson_reference/lesson_reference.py similarity index 83% rename from community/lms/doctype/chapters/chapters.py rename to community/lms/doctype/lesson_reference/lesson_reference.py index 5d07b66e..749129d3 100644 --- a/community/lms/doctype/chapters/chapters.py +++ b/community/lms/doctype/lesson_reference/lesson_reference.py @@ -4,5 +4,5 @@ # import frappe from frappe.model.document import Document -class Chapters(Document): +class LessonReference(Document): pass diff --git a/community/lms/doctype/lms_course/lms_course.json b/community/lms/doctype/lms_course/lms_course.json index d8c4d9e2..30a8475b 100644 --- a/community/lms/doctype/lms_course/lms_course.json +++ b/community/lms/doctype/lms_course/lms_course.json @@ -100,7 +100,7 @@ "fieldname": "chapters", "fieldtype": "Table", "label": "Chapters", - "options": "Chapters" + "options": "Chapter Reference" }, { "fieldname": "instructor", @@ -160,9 +160,14 @@ "group": "Mentors", "link_doctype": "LMS Course Mentor Mapping", "link_fieldname": "course" + }, + { + "group": "Interests", + "link_doctype": "LMS Course Interest", + "link_fieldname": "course" } ], - "modified": "2021-08-25 11:04:57.211898", + "modified": "2021-09-20 12:00:18.325579", "modified_by": "Administrator", "module": "LMS", "name": "LMS Course", diff --git a/community/lms/doctype/lms_course/lms_course.py b/community/lms/doctype/lms_course/lms_course.py index 385bf762..56330d77 100644 --- a/community/lms/doctype/lms_course/lms_course.py +++ b/community/lms/doctype/lms_course/lms_course.py @@ -176,7 +176,7 @@ class LMSCourse(Document): def get_lesson_details(self, chapter): lessons = [] - lesson_list = frappe.get_all("Lessons", {"parent": chapter.name}, + lesson_list = frappe.get_all("Lesson Reference", {"parent": chapter.name}, ["lesson", "idx"], order_by="idx") for row in lesson_list: lesson_details = frappe.get_doc("Lesson", row.lesson) @@ -213,7 +213,7 @@ class LMSCourse(Document): def get_lesson_index(self, lesson_name): """Returns the {chapter_index}.{lesson_index} for the lesson. """ - lesson = frappe.db.get_value("Lessons", {"lesson": lesson_name}, ["idx", "parent"], as_dict=True) + lesson = frappe.db.get_value("Lesson Reference", {"lesson": lesson_name}, ["idx", "parent"], as_dict=True) if not lesson: return None diff --git a/community/lms/doctype/lms_quiz/lms_quiz.json b/community/lms/doctype/lms_quiz/lms_quiz.json index e76c35a5..a1af03f2 100644 --- a/community/lms/doctype/lms_quiz/lms_quiz.json +++ b/community/lms/doctype/lms_quiz/lms_quiz.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_rename": 1, "autoname": "field:title", "creation": "2021-06-07 10:50:17.893625", "doctype": "DocType", @@ -33,10 +34,11 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-07-23 19:06:12.551633", + "modified": "2021-09-20 10:44:15.930892", "modified_by": "Administrator", "module": "LMS", "name": "LMS Quiz", + "naming_rule": "By fieldname", "owner": "Administrator", "permissions": [ { diff --git a/community/lms/widgets/ChapterTeaser.html b/community/lms/widgets/ChapterTeaser.html index 8edfa580..5225d78e 100644 --- a/community/lms/widgets/ChapterTeaser.html +++ b/community/lms/widgets/ChapterTeaser.html @@ -21,7 +21,7 @@
- {% if membership or lesson.include_in_preview or is_instructor %} + {% if membership or lesson.include_in_preview %} {{ lesson.title }} @@ -33,6 +33,15 @@ + {% elif is_instructor and not lesson.include_in_preview %} + + {{ lesson.title }} + + + {% else %}
diff --git a/community/public/css/style.css b/community/public/css/style.css index d284f41d..6b4d555d 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -924,6 +924,10 @@ input[type=checkbox] { flex-direction: column; } +.lesson-content-card .alert-dismissible .close { + padding: 0.5rem; +} + .course-content-parent { display: grid; grid-gap: 2rem; diff --git a/community/public/node_modules b/community/public/node_modules new file mode 120000 index 00000000..329445fa --- /dev/null +++ b/community/public/node_modules @@ -0,0 +1 @@ +/Users/jandoe/Dev/frappe-bench/apps/community/node_modules \ No newline at end of file diff --git a/community/www/batch/learn.html b/community/www/batch/learn.html index 650e8a2c..2ae5287b 100644 --- a/community/www/batch/learn.html +++ b/community/www/batch/learn.html @@ -47,10 +47,17 @@ {% if membership or lesson.include_in_preview or is_instructor %} -
{{ lesson.render_html() }}
+
+ {% if is_instructor %} + + This lesson is not available for preview. As you are the Instructor of the course only you can see it. + × + + {% endif %} + {{ lesson.render_html() }}
{% else %}
- This lesson is not available for Preview. Please join the course to access this lesson. This lesson is not available for Preview. Please join the course to access it. Checkout Course Details.
{% endif %} diff --git a/community/www/courses/index.py b/community/www/courses/index.py index 84343481..6cc72787 100644 --- a/community/www/courses/index.py +++ b/community/www/courses/index.py @@ -11,7 +11,7 @@ def get_context(context): } def get_courses(): - course_names = frappe.get_all("LMS Course", filters={"is_published": True}, pluck="name") + course_names = frappe.get_all("LMS Course", filters={"is_published": True}, order_by="upcoming", pluck="name") courses = [] for course in course_names: courses.append(frappe.get_doc("LMS Course", course)) From 73b6ddf3658cc0ec96db72b9674ef70800558c19 Mon Sep 17 00:00:00 2001 From: Jannat Patel <31363128+pateljannat@users.noreply.github.com> Date: Mon, 20 Sep 2021 12:21:40 +0530 Subject: [PATCH 5/9] fix: deleted unnecessary file --- community/public/node_modules | 1 - 1 file changed, 1 deletion(-) delete mode 120000 community/public/node_modules diff --git a/community/public/node_modules b/community/public/node_modules deleted file mode 120000 index 329445fa..00000000 --- a/community/public/node_modules +++ /dev/null @@ -1 +0,0 @@ -/Users/jandoe/Dev/frappe-bench/apps/community/node_modules \ No newline at end of file From 29fe75d807dde411ad4ab9e2e3c4b887e20ea541 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 20 Sep 2021 15:12:23 +0530 Subject: [PATCH 6/9] fix: regex in page renderer --- community/page_renderers.py | 5 ++--- community/www/profiles/profile.py | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/community/page_renderers.py b/community/page_renderers.py index 4567d106..226501ae 100644 --- a/community/page_renderers.py +++ b/community/page_renderers.py @@ -31,7 +31,7 @@ def get_profile_url_prefix(): hooks = frappe.get_hooks("profile_url_prefix") or ["/users/"] return hooks[-1] -RE_USERNAME = re.compile("[a-zA-Z0-9_]{4,}") +RE_INVALID_USERNAME = re.compile("[@!#$%^&*()<>?/\\|}{~:-]") class ProfileRedirectPage(BaseRenderer): """Renderer to redirect /profile_/foo to /foo. @@ -63,9 +63,8 @@ class ProfilePage(BaseRenderer): # not a userpage? username = self.get_username() - if not RE_USERNAME.match(username): + if RE_INVALID_USERNAME.search(username): return False - # if there is prefix then we can allow all usernames if prefix: return True diff --git a/community/www/profiles/profile.py b/community/www/profiles/profile.py index 25d8254a..65b1bbca 100644 --- a/community/www/profiles/profile.py +++ b/community/www/profiles/profile.py @@ -10,7 +10,6 @@ def get_context(context): except KeyError: username = frappe.db.get_value("User", frappe.session.user, ["username"]) if username: - print(username) frappe.local.flags.redirect_location = get_profile_url_prefix() + urlencode({"username": username}) raise frappe.Redirect try: @@ -18,7 +17,6 @@ def get_context(context): except: context.template = "www/404.html" return - print(context.member) context.profile_tabs = get_profile_tabs(context.member) def get_profile_tabs(user): From d1353380882f9112f5871318721558d3d9c2775d Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 20 Sep 2021 17:49:13 +0530 Subject: [PATCH 7/9] fix: patch --- community/patches.txt | 1 + .../v0_0/rename_chapters_and_lessons_doctype.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 community/patches/v0_0/rename_chapters_and_lessons_doctype.py diff --git a/community/patches.txt b/community/patches.txt index 853dd9d0..0ab8479a 100644 --- a/community/patches.txt +++ b/community/patches.txt @@ -11,3 +11,4 @@ execute:frappe.delete_doc("DocType", "LMS Message") community.patches.v0_0.course_instructor_update execute:frappe.delete_doc("DocType", "Discussion Message") execute:frappe.delete_doc("DocType", "Discussion Thread") +community.patches.v0_0.rename_chapters_and_lessons_doctype diff --git a/community/patches/v0_0/rename_chapters_and_lessons_doctype.py b/community/patches/v0_0/rename_chapters_and_lessons_doctype.py new file mode 100644 index 00000000..9775c845 --- /dev/null +++ b/community/patches/v0_0/rename_chapters_and_lessons_doctype.py @@ -0,0 +1,16 @@ +import frappe + +def execute(): + frappe.reload_doc("lms", "doctype", "lms_course") + frappe.reload_doc("lms", "doctype", "chapters") + frappe.reload_doc("lms", "doctype", "chapter") + frappe.reload_doc("lms", "doctype", "lessons") + frappe.reload_doc("lms", "doctype", "lesson") + frappe.reload_doc("lms", "doctype", "chapter_reference") + frappe.reload_doc("lms", "doctype", "lesson_reference") + + frappe.rename_doc("DocType", "Chapters", "Chapter Reference") + frappe.reload_doctype("Chapter Reference", force=True) + + frappe.rename_doc("DocType", "Lessons", "Lesson Reference") + frappe.reload_doctype("Lesson Reference", force=True) From b19c7f2fac3e1bf0183f5fcf70aaa463dc499163 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 20 Sep 2021 18:11:19 +0530 Subject: [PATCH 8/9] fix: move data between doctypes --- .../rename_chapters_and_lessons_doctype.py | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/community/patches/v0_0/rename_chapters_and_lessons_doctype.py b/community/patches/v0_0/rename_chapters_and_lessons_doctype.py index 9775c845..0086a14f 100644 --- a/community/patches/v0_0/rename_chapters_and_lessons_doctype.py +++ b/community/patches/v0_0/rename_chapters_and_lessons_doctype.py @@ -2,15 +2,28 @@ import frappe def execute(): frappe.reload_doc("lms", "doctype", "lms_course") - frappe.reload_doc("lms", "doctype", "chapters") frappe.reload_doc("lms", "doctype", "chapter") - frappe.reload_doc("lms", "doctype", "lessons") frappe.reload_doc("lms", "doctype", "lesson") frappe.reload_doc("lms", "doctype", "chapter_reference") frappe.reload_doc("lms", "doctype", "lesson_reference") - frappe.rename_doc("DocType", "Chapters", "Chapter Reference") - frappe.reload_doctype("Chapter Reference", force=True) + move_chapters() + move_lessons() + +def move_chapters(): + docs = frappe.get_all("Chapters", fields=["*"]) + for doc in docs: + keys = doc + keys.update({"doctype": "Chapter Reference"}) + del keys["name"] + frappe.get_doc(keys).save() + +def move_lessons(): + docs = frappe.get_all("Lessons", fields=["*"]) + for doc in docs: + keys = doc + keys.update({"doctype": "Lesson Reference"}) + del keys["name"] + frappe.get_doc(keys).save() + - frappe.rename_doc("DocType", "Lessons", "Lesson Reference") - frappe.reload_doctype("Lesson Reference", force=True) From 8551cfa32e29a7d5f02ccb7918a37645504677dc Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 20 Sep 2021 21:40:49 +0530 Subject: [PATCH 9/9] fix: check if present before adding --- .../patches/v0_0/rename_chapters_and_lessons_doctype.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/community/patches/v0_0/rename_chapters_and_lessons_doctype.py b/community/patches/v0_0/rename_chapters_and_lessons_doctype.py index 0086a14f..82d45556 100644 --- a/community/patches/v0_0/rename_chapters_and_lessons_doctype.py +++ b/community/patches/v0_0/rename_chapters_and_lessons_doctype.py @@ -7,8 +7,11 @@ def execute(): frappe.reload_doc("lms", "doctype", "chapter_reference") frappe.reload_doc("lms", "doctype", "lesson_reference") - move_chapters() - move_lessons() + if not frappe.db.count("Chapter Reference"): + move_chapters() + + if not frappe.db.count("Lesson Reference"): + move_lessons() def move_chapters(): docs = frappe.get_all("Chapters", fields=["*"])