From 8a5e8b53e8f10aa8acb8b4a2d5f89c9a7a7a647b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 15 Apr 2021 14:22:52 +0530 Subject: [PATCH] fix: Make group_name and user group members mandatory --- frappe/core/doctype/user/user.py | 7 +++++-- frappe/core/doctype/user_group/user_group.json | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 035333cbe9..b9889026fe 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -1019,8 +1019,11 @@ def extract_mentions(txt): emails = [] for mention in soup.find_all(class_='mention'): 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 email = mention['data-id'] emails.append(email) diff --git a/frappe/core/doctype/user_group/user_group.json b/frappe/core/doctype/user_group/user_group.json index 3d859dcc9a..64f2801e15 100644 --- a/frappe/core/doctype/user_group/user_group.json +++ b/frappe/core/doctype/user_group/user_group.json @@ -13,19 +13,22 @@ { "fieldname": "group_name", "fieldtype": "Data", + "in_list_view": 1, "label": "Group Name", + "reqd": 1, "unique": 1 }, { "fieldname": "user_group_members", "fieldtype": "Table MultiSelect", "label": "User Group Members", - "options": "User Group Member" + "options": "User Group Member", + "reqd": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-04-12 15:17:24.751710", + "modified": "2021-04-15 12:17:04.625640", "modified_by": "Administrator", "module": "Core", "name": "User Group",