From 5bcc8501dfae67805dc4c5dd796d9a922e3eebc2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 8 Jul 2020 11:50:13 +0530 Subject: [PATCH] fix: User DocType layout --- frappe/core/doctype/user/user.json | 298 ++++++++--------------------- 1 file changed, 84 insertions(+), 214 deletions(-) diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json index d99ee3af8f..890b1de861 100644 --- a/frappe/core/doctype/user/user.json +++ b/frappe/core/doctype/user/user.json @@ -24,6 +24,9 @@ "user_image", "sb1", "role_profile_name", + "column_break_18", + "column_break_19", + "section_break_20", "roles_html", "roles", "short_bio", @@ -90,17 +93,13 @@ "label": "Enabled", "oldfieldname": "enabled", "oldfieldtype": "Check", - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "depends_on": "enabled", "fieldname": "section_break_3", "fieldtype": "Section Break", - "label": "Basic Info", - "show_days": 1, - "show_seconds": 1 + "label": "Basic Info" }, { "fieldname": "email", @@ -110,9 +109,7 @@ "oldfieldname": "email", "oldfieldtype": "Data", "options": "Email", - "reqd": 1, - "show_days": 1, - "show_seconds": 1 + "reqd": 1 }, { "fieldname": "first_name", @@ -120,18 +117,14 @@ "label": "First Name", "oldfieldname": "first_name", "oldfieldtype": "Data", - "reqd": 1, - "show_days": 1, - "show_seconds": 1 + "reqd": 1 }, { "fieldname": "middle_name", "fieldtype": "Data", "label": "Middle Name (Optional)", "oldfieldname": "middle_name", - "oldfieldtype": "Data", - "show_days": 1, - "show_seconds": 1 + "oldfieldtype": "Data" }, { "bold": 1, @@ -139,9 +132,7 @@ "fieldtype": "Data", "label": "Last Name", "oldfieldname": "last_name", - "oldfieldtype": "Data", - "show_days": 1, - "show_seconds": 1 + "oldfieldtype": "Data" }, { "fieldname": "full_name", @@ -149,9 +140,7 @@ "in_global_search": 1, "in_standard_filter": 1, "label": "Full Name", - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "bold": 1, @@ -159,9 +148,7 @@ "depends_on": "eval:doc.__islocal", "fieldname": "send_welcome_email", "fieldtype": "Check", - "label": "Send Welcome Email", - "show_days": 1, - "show_seconds": 1 + "label": "Send Welcome Email" }, { "default": "0", @@ -169,17 +156,13 @@ "fieldtype": "Check", "hidden": 1, "label": "Unsubscribed", - "no_copy": 1, - "show_days": 1, - "show_seconds": 1 + "no_copy": 1 }, { "fieldname": "column_break0", "fieldtype": "Column Break", "oldfieldtype": "Column Break", "print_width": "50%", - "show_days": 1, - "show_seconds": 1, "width": "50%" }, { @@ -188,24 +171,18 @@ "in_global_search": 1, "in_standard_filter": 1, "label": "Username", - "show_days": 1, - "show_seconds": 1, "unique": 1 }, { "fieldname": "language", "fieldtype": "Link", "label": "Language", - "options": "Language", - "show_days": 1, - "show_seconds": 1 + "options": "Language" }, { "fieldname": "time_zone", "fieldtype": "Select", - "label": "Time Zone", - "show_days": 1, - "show_seconds": 1 + "label": "Time Zone" }, { "description": "Get your globally recognized avatar from Gravatar.com", @@ -214,9 +191,7 @@ "hidden": 1, "label": "User Image", "no_copy": 1, - "print_hide": 1, - "show_days": 1, - "show_seconds": 1 + "print_hide": 1 }, { "depends_on": "enabled", @@ -224,25 +199,19 @@ "fieldtype": "Section Break", "label": "Roles", "permlevel": 1, - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "fieldname": "role_profile_name", "fieldtype": "Link", "label": "Role Profile", - "options": "Role Profile", - "show_days": 1, - "show_seconds": 1 + "options": "Role Profile" }, { "fieldname": "roles_html", "fieldtype": "HTML", "label": "Roles HTML", - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "fieldname": "roles", @@ -252,18 +221,14 @@ "options": "Has Role", "permlevel": 1, "print_hide": 1, - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "collapsible": 1, "depends_on": "enabled", "fieldname": "short_bio", "fieldtype": "Section Break", - "label": "More Information", - "show_days": 1, - "show_seconds": 1 + "label": "More Information" }, { "fieldname": "gender", @@ -271,25 +236,19 @@ "label": "Gender", "oldfieldname": "gender", "oldfieldtype": "Select", - "options": "Gender", - "show_days": 1, - "show_seconds": 1 + "options": "Gender" }, { "fieldname": "phone", "fieldtype": "Data", "label": "Phone", - "options": "Phone", - "show_days": 1, - "show_seconds": 1 + "options": "Phone" }, { "fieldname": "mobile_no", "fieldtype": "Data", "label": "Mobile No", "options": "Phone", - "show_days": 1, - "show_seconds": 1, "unique": 1 }, { @@ -298,78 +257,58 @@ "label": "Birth Date", "no_copy": 1, "oldfieldname": "birth_date", - "oldfieldtype": "Date", - "show_days": 1, - "show_seconds": 1 + "oldfieldtype": "Date" }, { "fieldname": "location", "fieldtype": "Data", "label": "Location", - "no_copy": 1, - "show_days": 1, - "show_seconds": 1 + "no_copy": 1 }, { "fieldname": "banner_image", "fieldtype": "Attach Image", - "label": "Banner Image", - "show_days": 1, - "show_seconds": 1 + "label": "Banner Image" }, { "fieldname": "column_break_22", - "fieldtype": "Column Break", - "show_days": 1, - "show_seconds": 1 + "fieldtype": "Column Break" }, { "fieldname": "interest", "fieldtype": "Small Text", - "label": "Interests", - "show_days": 1, - "show_seconds": 1 + "label": "Interests" }, { "fieldname": "bio", "fieldtype": "Small Text", "label": "Bio", - "no_copy": 1, - "show_days": 1, - "show_seconds": 1 + "no_copy": 1 }, { "default": "0", "fieldname": "mute_sounds", "fieldtype": "Check", - "label": "Mute Sounds", - "show_days": 1, - "show_seconds": 1 + "label": "Mute Sounds" }, { "collapsible": 1, "depends_on": "eval:doc.enabled && (!doc.__islocal || !cint(doc.send_welcome_email))", "fieldname": "change_password", "fieldtype": "Section Break", - "label": "Change Password", - "show_days": 1, - "show_seconds": 1 + "label": "Change Password" }, { "fieldname": "new_password", "fieldtype": "Password", "label": "Set New Password", - "no_copy": 1, - "show_days": 1, - "show_seconds": 1 + "no_copy": 1 }, { "default": "0", "fieldname": "logout_all_sessions", "fieldtype": "Check", - "label": "Logout From All Devices After Changing Password", - "show_days": 1, - "show_seconds": 1 + "label": "Logout From All Devices After Changing Password" }, { "fieldname": "reset_password_key", @@ -378,9 +317,7 @@ "label": "Reset Password Key", "no_copy": 1, "print_hide": 1, - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "fieldname": "last_password_reset_date", @@ -389,33 +326,25 @@ "label": "Last Password Reset Date", "no_copy": 1, "print_hide": 1, - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "fieldname": "redirect_url", "fieldtype": "Small Text", "hidden": 1, - "label": "Redirect URL", - "show_days": 1, - "show_seconds": 1 + "label": "Redirect URL" }, { "collapsible": 1, "fieldname": "document_follow_notifications_section", "fieldtype": "Section Break", - "label": "Document Follow", - "show_days": 1, - "show_seconds": 1 + "label": "Document Follow" }, { "default": "0", "fieldname": "document_follow_notify", "fieldtype": "Check", - "label": "Send Notifications For Documents Followed By Me", - "show_days": 1, - "show_seconds": 1 + "label": "Send Notifications For Documents Followed By Me" }, { "default": "Daily", @@ -423,84 +352,64 @@ "fieldname": "document_follow_frequency", "fieldtype": "Select", "label": "Frequency", - "options": "Hourly\nDaily\nWeekly", - "show_days": 1, - "show_seconds": 1 + "options": "Hourly\nDaily\nWeekly" }, { "collapsible": 1, "depends_on": "enabled", "fieldname": "email_settings", "fieldtype": "Section Break", - "label": "Email Settings", - "show_days": 1, - "show_seconds": 1 + "label": "Email Settings" }, { "default": "1", "fieldname": "thread_notify", "fieldtype": "Check", - "label": "Send Notifications For Email Threads", - "show_days": 1, - "show_seconds": 1 + "label": "Send Notifications For Email Threads" }, { "default": "0", "fieldname": "send_me_a_copy", "fieldtype": "Check", - "label": "Send Me A Copy of Outgoing Emails", - "show_days": 1, - "show_seconds": 1 + "label": "Send Me A Copy of Outgoing Emails" }, { "default": "1", "fieldname": "allowed_in_mentions", "fieldtype": "Check", - "label": "Allowed In Mentions", - "show_days": 1, - "show_seconds": 1 + "label": "Allowed In Mentions" }, { "fieldname": "email_signature", "fieldtype": "Small Text", "label": "Email Signature", - "no_copy": 1, - "show_days": 1, - "show_seconds": 1 + "no_copy": 1 }, { "collapsible": 1, "fieldname": "email_inbox", "fieldtype": "Section Break", - "label": "Email Inbox", - "show_days": 1, - "show_seconds": 1 + "label": "Email Inbox" }, { "fieldname": "user_emails", "fieldtype": "Table", "label": "User Emails", "options": "User Email", - "permlevel": 1, - "show_days": 1, - "show_seconds": 1 + "permlevel": 1 }, { "collapsible": 1, "fieldname": "sb_allow_modules", "fieldtype": "Section Break", "label": "Allow Modules", - "permlevel": 1, - "show_days": 1, - "show_seconds": 1 + "permlevel": 1 }, { "fieldname": "modules_html", "fieldtype": "HTML", "label": "Modules HTML", - "permlevel": 1, - "show_days": 1, - "show_seconds": 1 + "permlevel": 1 }, { "fieldname": "block_modules", @@ -508,17 +417,13 @@ "hidden": 1, "label": "Block Modules", "options": "Block Module", - "permlevel": 1, - "show_days": 1, - "show_seconds": 1 + "permlevel": 1 }, { "fieldname": "home_settings", "fieldtype": "Code", "hidden": 1, - "label": "Home Settings", - "show_days": 1, - "show_seconds": 1 + "label": "Home Settings" }, { "description": "These values will be automatically updated in transactions and also will be useful to restrict permissions for this user on transactions containing these values.", @@ -530,8 +435,6 @@ "permlevel": 1, "print_width": "50%", "read_only": 1, - "show_days": 1, - "show_seconds": 1, "width": "50%" }, { @@ -541,9 +444,7 @@ "hidden": 1, "label": "User Defaults", "no_copy": 1, - "options": "DefaultValue", - "show_days": 1, - "show_seconds": 1 + "options": "DefaultValue" }, { "collapsible": 1, @@ -552,17 +453,13 @@ "fieldtype": "Section Break", "label": "Security Settings", "oldfieldtype": "Section Break", - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "default": "1", "fieldname": "simultaneous_sessions", "fieldtype": "Int", - "label": "Simultaneous Sessions", - "show_days": 1, - "show_seconds": 1 + "label": "Simultaneous Sessions" }, { "default": "System User", @@ -576,36 +473,28 @@ "oldfieldtype": "Select", "options": "System User\nWebsite User", "permlevel": 1, - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "description": "Allow user to login only after this hour (0-24)", "fieldname": "login_after", "fieldtype": "Int", "label": "Login After", - "permlevel": 1, - "show_days": 1, - "show_seconds": 1 + "permlevel": 1 }, { "description": "Allow user to login only before this hour (0-24)", "fieldname": "login_before", "fieldtype": "Int", "label": "Login Before", - "permlevel": 1, - "show_days": 1, - "show_seconds": 1 + "permlevel": 1 }, { "description": "Restrict user from this IP address only. Multiple IP addresses can be added by separating with commas. Also accepts partial IP addresses like (111.111.111)", "fieldname": "restrict_ip", "fieldtype": "Data", "label": "Restrict IP", - "permlevel": 1, - "show_days": 1, - "show_seconds": 1 + "permlevel": 1 }, { "default": "0", @@ -613,17 +502,13 @@ "description": "If enabled, user can login from any IP Address using Two Factor Auth, this can also be set for all users in System Settings", "fieldname": "bypass_restrict_ip_check_if_2fa_enabled", "fieldtype": "Check", - "label": "Bypass Restricted IP Address Check If Two Factor Auth Enabled", - "show_days": 1, - "show_seconds": 1 + "label": "Bypass Restricted IP Address Check If Two Factor Auth Enabled" }, { "fieldname": "column_break1", "fieldtype": "Column Break", "oldfieldtype": "Column Break", "print_width": "50%", - "show_days": 1, - "show_seconds": 1, "width": "50%" }, { @@ -633,9 +518,7 @@ "no_copy": 1, "oldfieldname": "last_login", "oldfieldtype": "Read Only", - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "fieldname": "last_ip", @@ -644,18 +527,14 @@ "no_copy": 1, "oldfieldname": "last_ip", "oldfieldtype": "Read Only", - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "fieldname": "last_active", "fieldtype": "Datetime", "label": "Last Active", "no_copy": 1, - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "description": "Stores the JSON of last known versions of various installed apps. It is used to show release notes.", @@ -663,9 +542,7 @@ "fieldtype": "Text", "hidden": 1, "label": "Last Known Versions", - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "collapsible": 1, @@ -673,25 +550,19 @@ "fieldname": "third_party_authentication", "fieldtype": "Section Break", "label": "Third Party Authentication", - "permlevel": 1, - "show_days": 1, - "show_seconds": 1 + "permlevel": 1 }, { "fieldname": "social_logins", "fieldtype": "Table", "label": "Social Logins", - "options": "User Social Login", - "show_days": 1, - "show_seconds": 1 + "options": "User Social Login" }, { "collapsible": 1, "fieldname": "api_access", "fieldtype": "Section Break", - "label": "Api Access", - "show_days": 1, - "show_seconds": 1 + "label": "Api Access" }, { "description": "API Key cannot be regenerated", @@ -699,48 +570,47 @@ "fieldtype": "Data", "label": "API Key", "read_only": 1, - "show_days": 1, - "show_seconds": 1, "unique": 1 }, { "fieldname": "generate_keys", "fieldtype": "Button", - "label": "Generate Keys", - "show_days": 1, - "show_seconds": 1 + "label": "Generate Keys" }, { "fieldname": "column_break_65", - "fieldtype": "Column Break", - "show_days": 1, - "show_seconds": 1 + "fieldtype": "Column Break" }, { "fieldname": "api_secret", "fieldtype": "Password", "label": "API Secret", - "read_only": 1, - "show_days": 1, - "show_seconds": 1 + "read_only": 1 }, { "fieldname": "column_break_11", - "fieldtype": "Column Break", - "show_days": 1, - "show_seconds": 1 + "fieldtype": "Column Break" }, { "fieldname": "column_break_26", - "fieldtype": "Column Break", - "show_days": 1, - "show_seconds": 1 + "fieldtype": "Column Break" }, { "fieldname": "section_break_63", - "fieldtype": "Column Break", - "show_days": 1, - "show_seconds": 1 + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_18", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_19", + "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_20", + "fieldtype": "Section Break", + "hide_border": 1 } ], "icon": "fa fa-user", @@ -748,7 +618,7 @@ "image_field": "user_image", "links": [], "max_attachments": 5, - "modified": "2020-06-04 08:48:45.355159", + "modified": "2020-06-23 07:49:33.387721", "modified_by": "Administrator", "module": "Core", "name": "User",