fix: patch to update name of member
This commit is contained in:
@@ -2,7 +2,6 @@
|
|||||||
"actions": [],
|
"actions": [],
|
||||||
"allow_guest_to_view": 1,
|
"allow_guest_to_view": 1,
|
||||||
"allow_rename": 1,
|
"allow_rename": 1,
|
||||||
"autoname": "field:email",
|
|
||||||
"creation": "2021-02-12 15:47:23.591567",
|
"creation": "2021-02-12 15:47:23.591567",
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"editable_grid": 1,
|
"editable_grid": 1,
|
||||||
@@ -108,7 +107,7 @@
|
|||||||
"has_web_view": 1,
|
"has_web_view": 1,
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-04-12 13:34:41.573486",
|
"modified": "2021-04-12 17:32:36.211603",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Community",
|
"module": "Community",
|
||||||
"name": "Community Member",
|
"name": "Community Member",
|
||||||
|
|||||||
@@ -27,10 +27,6 @@ class CommunityMember(WebsiteGenerator):
|
|||||||
frappe.throw(_("Username can only contain alphabets, numbers and underscore."))
|
frappe.throw(_("Username can only contain alphabets, numbers and underscore."))
|
||||||
self.username = self.username.lower()
|
self.username = self.username.lower()
|
||||||
|
|
||||||
def on_update(self):
|
|
||||||
if self.username != self.name:
|
|
||||||
rename_doc(self.doctype, self.name, self.username, force=False, merge=False, ignore_permissions=True, ignore_if_exists=False)
|
|
||||||
|
|
||||||
def create_member_from_user(doc, method):
|
def create_member_from_user(doc, method):
|
||||||
member = frappe.get_doc({
|
member = frappe.get_doc({
|
||||||
"doctype": "Community Member",
|
"doctype": "Community Member",
|
||||||
|
|||||||
@@ -149,6 +149,8 @@ whitelist = [
|
|||||||
"/sketches",
|
"/sketches",
|
||||||
"/admin",
|
"/admin",
|
||||||
"/socket.io",
|
"/socket.io",
|
||||||
|
"/hackathons",
|
||||||
|
"/dashboard"
|
||||||
]
|
]
|
||||||
whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]
|
whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
community.patches.set_email_preferences
|
community.patches.set_email_preferences
|
||||||
|
community.patches.change_name_for_community_members
|
||||||
12
community/patches/change_name_for_community_members.py
Normal file
12
community/patches/change_name_for_community_members.py
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
from __future__ import unicode_literals
|
||||||
|
import frappe
|
||||||
|
from frappe.model.naming import make_autoname
|
||||||
|
from frappe.model.rename_doc import rename_doc
|
||||||
|
|
||||||
|
def execute():
|
||||||
|
frappe.reload_doc("community", "doctype", "community_member")
|
||||||
|
docs = frappe.get_all("Community Member")
|
||||||
|
for doc in docs:
|
||||||
|
member = frappe.get_doc("Community Member", doc.name)
|
||||||
|
name = make_autoname("hash", "Community Member")
|
||||||
|
rename_doc("Community Member", member.name, name, force=True, merge=False, ignore_permissions=True, ignore_if_exists=False)
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
{% extends "templates/base.html" %}
|
{% extends "templates/base.html" %}
|
||||||
|
{% from "www/macros/profile.html" import profile %}
|
||||||
{% block title %}{{ _("Community") }}{% endblock %}
|
{% block title %}{{ _("Community") }}{% endblock %}
|
||||||
{% block head_include %}
|
{% block head_include %}
|
||||||
<meta name="description" content="{{ 'Community' }}" />
|
<meta name="description" content="{{ 'Community' }}" />
|
||||||
@@ -86,19 +87,6 @@
|
|||||||
</style>
|
</style>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% macro profile(photo, full_name, abbr, icon) %}
|
|
||||||
{% if photo %}
|
|
||||||
<img class="avatar rounded-circle img-fluid mr-5{% if icon == 'large' %} avatar-xl {% else %} avatar-large {% endif %}"
|
|
||||||
src="{{ photo }}" alt="{{ full_name }}">
|
|
||||||
{% else %}
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<div class="standard-image {% if icon == 'large' %} dashboard__abbr {% else %} dashboard__abbrSmall {% endif %}">
|
|
||||||
{{ abbr }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% endmacro %}
|
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<section>
|
<section>
|
||||||
<div class="dashboard__parent">
|
<div class="dashboard__parent">
|
||||||
@@ -159,9 +147,9 @@
|
|||||||
<div class="tab-pane fade py-4" role="tabpanel" id="sketches">
|
<div class="tab-pane fade py-4" role="tabpanel" id="sketches">
|
||||||
<div class='container'>
|
<div class='container'>
|
||||||
<a href="/sketches/new">Create a New Sketch</a>
|
<a href="/sketches/new">Create a New Sketch</a>
|
||||||
{% if sketches %}
|
<div class="row row-cols-1 row-cols-xl-5 row-cols-lg-4 row-cols-md-3 row-cols-sm-2">
|
||||||
{% for sketch in sketches %}
|
{% if sketches %}
|
||||||
<div class="row row-cols-1 row-cols-xl-5 row-cols-lg-4 row-cols-md-3 row-cols-sm-2 pt-5">
|
{% for sketch in sketches %}
|
||||||
<div class="col mb-4">
|
<div class="col mb-4">
|
||||||
<div class="card sketch-card" style="width: 200px;">
|
<div class="card sketch-card" style="width: 200px;">
|
||||||
<div class="card-img-top">
|
<div class="card-img-top">
|
||||||
@@ -179,11 +167,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
<p class="text-center">You have not created any sketches.</p>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
|
||||||
{% else %}
|
|
||||||
<p class="text-center">You have not created any sketches.</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="tab-pane fade py-4" role="tabpanel" id="courses">
|
<div class="tab-pane fade py-4" role="tabpanel" id="courses">
|
||||||
|
|||||||
12
community/www/macros/profile.html
Normal file
12
community/www/macros/profile.html
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
{% macro profile(photo, full_name, abbr, icon) %}
|
||||||
|
{% if photo %}
|
||||||
|
<img class="avatar rounded-circle img-fluid mr-5{% if icon == 'large' %} avatar-xl {% else %} avatar-large {% endif %}"
|
||||||
|
src="{{ photo }}" alt="{{ full_name }}">
|
||||||
|
{% else %}
|
||||||
|
<div class="col-sm-2">
|
||||||
|
<div class="standard-image {% if icon == 'large' %} dashboard__abbr {% else %} dashboard__abbrSmall {% endif %}">
|
||||||
|
{{ abbr }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endmacro %}
|
||||||
@@ -1,25 +1,11 @@
|
|||||||
{% extends "templates/web.html" %}
|
{% extends "templates/web.html" %}
|
||||||
|
{% from "www/macros/profile.html" import profile %}
|
||||||
{% block page_content %}
|
{% block page_content %}
|
||||||
<div class="py-20 row">
|
<section>
|
||||||
{% if user.photo %}
|
<div>
|
||||||
<div class="col-sm-2 border border-dark">
|
{{ profile(member.photo, member.full_name, abbr, "large")}}
|
||||||
<img src="{{ user.photo }}" alt="{{ user.full_name }}">
|
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
</section>
|
||||||
<div class="col-sm-2">
|
|
||||||
<div class="standard-image" style="font-size: 30px;">{{ user.abbr }}</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<div class="col">
|
|
||||||
<h1>{{ user.full_name }}</h1>
|
|
||||||
{% if user.short_intro %}
|
|
||||||
<p class="lead"> {{ user.short_intro }} </p>
|
|
||||||
{% endif %}
|
|
||||||
{% if user.bio %}
|
|
||||||
<p class="markdown-style"> {{ frappe.utils.md_to_html(user.bio) }} </p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
<!-- this is a sample default web page template -->
|
<!-- this is a sample default web page template -->
|
||||||
Reference in New Issue
Block a user