Browse Source

fix: Make group_name and user group members mandatory

version-14
Suraj Shetty 4 years ago
parent
commit
8a5e8b53e8
2 changed files with 10 additions and 4 deletions
  1. +5
    -2
      frappe/core/doctype/user/user.py
  2. +5
    -2
      frappe/core/doctype/user_group/user_group.json

+ 5
- 2
frappe/core/doctype/user/user.py View File

@@ -1019,8 +1019,11 @@ def extract_mentions(txt):
emails = [] emails = []
for mention in soup.find_all(class_='mention'): for mention in soup.find_all(class_='mention'):
if mention.get('data-is-group'): if mention.get('data-is-group'):
user_group = frappe.get_cached_doc('User Group', mention['data-id'])
emails += [d.user for d in user_group.user_group_members]
try:
user_group = frappe.get_cached_doc('User Group', mention['data-id'])
emails += [d.user for d in user_group.user_group_members]
except frappe.DoesNotExistError:
pass
continue continue
email = mention['data-id'] email = mention['data-id']
emails.append(email) emails.append(email)


+ 5
- 2
frappe/core/doctype/user_group/user_group.json View File

@@ -13,19 +13,22 @@
{ {
"fieldname": "group_name", "fieldname": "group_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1,
"label": "Group Name", "label": "Group Name",
"reqd": 1,
"unique": 1 "unique": 1
}, },
{ {
"fieldname": "user_group_members", "fieldname": "user_group_members",
"fieldtype": "Table MultiSelect", "fieldtype": "Table MultiSelect",
"label": "User Group Members", "label": "User Group Members",
"options": "User Group Member"
"options": "User Group Member",
"reqd": 1
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2021-04-12 15:17:24.751710",
"modified": "2021-04-15 12:17:04.625640",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Core", "module": "Core",
"name": "User Group", "name": "User Group",


Loading…
Cancel
Save