eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove page renderer for profile page

Browse Source
This commit is contained in:
Jannat Patel
2021-12-06 10:51:50 +05:30
parent 740c0d10ca
commit 7c5021132d
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
school/community/widgets/Avatar.html
View File

@@ -1,5 +1,5 @@
{% set color = member.get_palette() %} {% set color = member.get_palette() %}
<a class="button-links" href="{{ member.get_profile_url(member.username) }}"> <a class="button-links" href="member.get_profile_url()">
<span class="avatar {{ avatar_class }}" title="{{ member.full_name }}"> <span class="avatar {{ avatar_class }}" title="{{ member.full_name }}">
{% if member.user_image %} {% if member.user_image %}
<img class="avatar-frame standard-image" style="object-fit: cover;" src="{{ member.user_image }}" title="{{ member.full_name }}"> <img class="avatar-frame standard-image" style="object-fit: cover;" src="{{ member.user_image }}" title="{{ member.full_name }}">

10
school/hooks.py
View File

@@ -141,7 +141,7 @@ website_route_rules = [
{"from_route": "/courses/<course>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"}, {"from_route": "/courses/<course>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"},
{"from_route": "/courses/<course>/progress", "to_route": "batch/progress"}, {"from_route": "/courses/<course>/progress", "to_route": "batch/progress"},
{"from_route": "/courses/<course>/join", "to_route": "batch/join"}, {"from_route": "/courses/<course>/join", "to_route": "batch/join"},
{"from_route": "/users", "to_route": "profiles/profile"} {"from_route": "/users/<string(minlength=4):username>", "to_route": "profiles/profile"}
] ]
website_redirects = [ website_redirects = [
@@ -180,10 +180,10 @@ school_markdown_macro_renderers = {
} }
# page_renderer to manage profile pages # page_renderer to manage profile pages
page_renderer = [ #page_renderer = [
"school.page_renderers.ProfileRedirectPage", # "school.page_renderers.ProfileRedirectPage",
"school.page_renderers.ProfilePage" # "school.page_renderers.ProfilePage"
] #]
# set this to "/" to have profiles on the top-level # set this to "/" to have profiles on the top-level
profile_url_prefix = "/users/" profile_url_prefix = "/users/"

2
school/lms/widgets/CourseCard.html
View File

@@ -44,7 +44,7 @@
{% set instructor = course.get_instructor() %} {% set instructor = course.get_instructor() %}
<span class="zindex"> <span class="zindex">
{{ widgets.Avatar(member=instructor, avatar_class="avatar-small") }} {{ widgets.Avatar(member=instructor, avatar_class="avatar-small") }}
<a class="button-links" href="{{ instructor.get_profile_url(instructor.username) }}"> <a class="button-links" href="instructor.get_profile_url()">
<span class="course-instructor"> <span class="course-instructor">
{{ instructor.full_name }} {{ instructor.full_name }}
</span> </span>

6
school/overrides/user.py
View File

@@ -147,4 +147,8 @@ class CustomUser(User):
} }
def get_profile_url(self): 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]