From 7c5021132dff7306fa49647032e3e12354f7b51d Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 6 Dec 2021 10:51:50 +0530 Subject: [PATCH] fix: remove page renderer for profile page --- school/community/widgets/Avatar.html | 2 +- school/hooks.py | 10 +++++----- school/lms/widgets/CourseCard.html | 2 +- school/overrides/user.py | 6 +++++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/school/community/widgets/Avatar.html b/school/community/widgets/Avatar.html index 7ebc80c5..b2ed089c 100644 --- a/school/community/widgets/Avatar.html +++ b/school/community/widgets/Avatar.html @@ -1,5 +1,5 @@ {% set color = member.get_palette() %} - + {% if member.user_image %} diff --git a/school/hooks.py b/school/hooks.py index 01d6d866..9a86f1eb 100644 --- a/school/hooks.py +++ b/school/hooks.py @@ -141,7 +141,7 @@ website_route_rules = [ {"from_route": "/courses//learn/.", "to_route": "batch/learn"}, {"from_route": "/courses//progress", "to_route": "batch/progress"}, {"from_route": "/courses//join", "to_route": "batch/join"}, - {"from_route": "/users", "to_route": "profiles/profile"} + {"from_route": "/users/", "to_route": "profiles/profile"} ] website_redirects = [ @@ -180,10 +180,10 @@ school_markdown_macro_renderers = { } # page_renderer to manage profile pages -page_renderer = [ - "school.page_renderers.ProfileRedirectPage", - "school.page_renderers.ProfilePage" -] +#page_renderer = [ +# "school.page_renderers.ProfileRedirectPage", +# "school.page_renderers.ProfilePage" +#] # set this to "/" to have profiles on the top-level profile_url_prefix = "/users/" diff --git a/school/lms/widgets/CourseCard.html b/school/lms/widgets/CourseCard.html index 2e909ba8..7b4ade55 100644 --- a/school/lms/widgets/CourseCard.html +++ b/school/lms/widgets/CourseCard.html @@ -44,7 +44,7 @@ {% set instructor = course.get_instructor() %} {{ widgets.Avatar(member=instructor, avatar_class="avatar-small") }} - + {{ instructor.full_name }} diff --git a/school/overrides/user.py b/school/overrides/user.py index 9d94e3da..130856a1 100644 --- a/school/overrides/user.py +++ b/school/overrides/user.py @@ -147,4 +147,8 @@ class CustomUser(User): } def get_profile_url(self): - return get_profile_url() + return get_profile_url_prefix() + self.username + + def get_profile_url_prefix(): + hooks = frappe.get_hooks("profile_url_prefix") or ["/users/"] + return hooks[-1]