refactor!: Lower roles from All To Desk User

frappe · Aug 29, 2023 · dc8d7b0 · dc8d7b0
1 parent 1b406ed
commit dc8d7b0
Show file tree

Hide file tree

Showing 30 changed files with 85 additions and 75 deletions.
diff --git a/frappe/automation/doctype/reminder/reminder.json b/frappe/automation/doctype/reminder/reminder.json
@@ -66,7 +66,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-02-24 13:47:50.419648",
+ "modified": "2023-08-28 22:17:18.351025",
  "modified_by": "Administrator",
  "module": "Automation",
  "name": "Reminder",
@@ -78,7 +78,7 @@
    "delete": 1,
    "if_owner": 1,
    "read": 1,
-   "role": "All",
+   "role": "Desk User",
    "write": 1
   }
  ],

diff --git a/frappe/core/doctype/activity_log/activity_log.json b/frappe/core/doctype/activity_log/activity_log.json
@@ -158,7 +158,7 @@
  "icon": "fa fa-comment",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-07-28 13:26:32.281278",
+ "modified": "2023-08-28 20:22:10.992615",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Activity Log",
@@ -170,16 +170,6 @@
    "report": 1,
    "role": "System Manager",
    "share": 1
-  },
-  {
-   "email": 1,
-   "export": 1,
-   "if_owner": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "All",
-   "share": 1
   }
  ],
  "search_fields": "subject",

diff --git a/frappe/core/doctype/report/report.json b/frappe/core/doctype/report/report.json
@@ -231,12 +231,12 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "All"
+   "role": "Desk User"
   }
  ],
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}
diff --git a/frappe/core/doctype/role/role.js b/frappe/core/doctype/role/role.js
@@ -5,7 +5,12 @@ frappe.ui.form.on("Role", {
 	refresh: function (frm) {
 		if (frm.doc.name === "All") {
 			frm.dashboard.add_comment(
-				__("Role 'All' will be given to all System Users."),
+				__("Role 'All' will be given to all system + website users."),
+				"yellow"
+			);
+		} else if (frm.doc.name === "Desk User") {
+			frm.dashboard.add_comment(
+				__("Role 'Desk User' will be given to all system users."),
 				"yellow"
 			);
 		}

diff --git a/frappe/core/doctype/submission_queue/submission_queue.json b/frappe/core/doctype/submission_queue/submission_queue.json
@@ -88,7 +88,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-01-23 12:45:53.997708",
+ "modified": "2023-08-28 22:25:55.480699",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Submission Queue",
@@ -107,7 +107,7 @@
   {
    "if_owner": 1,
    "read": 1,
-   "role": "All"
+   "role": "Desk User"
   }
  ],
  "sort_field": "modified",

diff --git a/frappe/core/doctype/user_group/user_group.json b/frappe/core/doctype/user_group/user_group.json
@@ -19,10 +19,11 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-04-15 16:12:31.455401",
+ "modified": "2023-08-28 22:25:16.941457",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "User Group",
+ "naming_rule": "Set by user",
  "owner": "Administrator",
  "permissions": [
   {
@@ -39,10 +40,11 @@
   },
   {
    "read": 1,
-   "role": "All"
+   "role": "Desk User"
   }
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
diff --git a/frappe/custom/doctype/doctype_layout/doctype_layout.json b/frappe/custom/doctype/doctype_layout/doctype_layout.json
@@ -43,7 +43,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-02-14 17:53:24.486171",
+ "modified": "2023-08-28 22:24:08.103972",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "DocType Layout",
@@ -64,7 +64,7 @@
   },
   {
    "read": 1,
-   "role": "All"
+   "role": "Desk User"
   }
  ],
  "route": "doctype-layout",

diff --git a/frappe/desk/doctype/calendar_view/calendar_view.json b/frappe/desk/doctype/calendar_view/calendar_view.json
@@ -53,10 +53,11 @@
   }
  ],
  "links": [],
- "modified": "2020-09-18 17:26:09.703215",
+ "modified": "2023-08-28 22:29:39.662726",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Calendar View",
+ "naming_rule": "Set by user",
  "owner": "Administrator",
  "permissions": [
   {
@@ -73,9 +74,10 @@
   },
   {
    "read": 1,
-   "role": "All"
+   "role": "Desk User"
   }
  ],
  "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
 }
diff --git a/frappe/desk/doctype/custom_html_block/custom_html_block.json b/frappe/desk/doctype/custom_html_block/custom_html_block.json
@@ -93,7 +93,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-05-30 14:33:31.994738",
+ "modified": "2023-08-28 20:25:00.740795",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Custom HTML Block",
@@ -106,7 +106,7 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "All",
+   "role": "Desk User",
    "share": 1
   },
   {
@@ -118,7 +118,7 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "All",
+   "role": "Desk User",
    "share": 1,
    "write": 1
   },

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
@@ -67,7 +67,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-23 11:05:41.890459",
+ "modified": "2023-08-28 22:35:02.993039",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
@@ -103,13 +103,14 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "All",
+   "role": "Desk User",
    "share": 1
   }
  ],
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "dashboard_name",
  "track_changes": 1
 }
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -287,7 +287,7 @@
   }
  ],
  "links": [],
- "modified": "2023-08-14 16:33:30.172798",
+ "modified": "2023-08-28 20:20:54.186299",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
@@ -324,7 +324,7 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "All",
+   "role": "Desk User",
    "share": 1
   }
  ],

diff --git a/frappe/desk/doctype/dashboard_settings/dashboard_settings.json b/frappe/desk/doctype/dashboard_settings/dashboard_settings.json
@@ -27,10 +27,11 @@
  ],
  "in_create": 1,
  "links": [],
- "modified": "2020-04-01 00:07:26.489561",
+ "modified": "2023-08-28 22:23:42.722543",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Settings",
+ "naming_rule": "Set by user",
  "owner": "Administrator",
  "permissions": [
   {
@@ -39,13 +40,14 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "All",
+   "role": "Desk User",
    "share": 1,
    "write": 1
   }
  ],
  "read_only": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
diff --git a/frappe/desk/doctype/form_tour/form_tour.json b/frappe/desk/doctype/form_tour/form_tour.json
@@ -178,7 +178,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-05-25 11:30:44.396248",
+ "modified": "2023-08-28 20:24:42.594360",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Form Tour",
@@ -199,7 +199,7 @@
   },
   {
    "read": 1,
-   "role": "All"
+   "role": "Desk User"
   }
  ],
  "sort_field": "modified",

diff --git a/frappe/desk/doctype/kanban_board/kanban_board.json b/frappe/desk/doctype/kanban_board/kanban_board.json
@@ -84,7 +84,7 @@
   }
  ],
  "links": [],
- "modified": "2022-04-13 12:10:20.284367",
+ "modified": "2023-08-28 22:29:29.569670",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Kanban Board",
@@ -93,14 +93,14 @@
  "permissions": [
   {
    "read": 1,
-   "role": "All"
+   "role": "Desk User"
   },
   {
    "create": 1,
    "delete": 1,
    "if_owner": 1,
    "read": 1,
-   "role": "All",
+   "role": "Desk User",
    "write": 1
   },
   {

diff --git a/frappe/desk/doctype/list_filter/list_filter.json b/frappe/desk/doctype/list_filter/list_filter.json
@@ -36,7 +36,7 @@
  ],
  "in_create": 1,
  "links": [],
- "modified": "2022-08-03 12:20:50.889979",
+ "modified": "2023-08-28 22:32:51.465521",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "List Filter",
@@ -50,7 +50,7 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "All",
+   "role": "Desk User",
    "share": 1,
    "write": 1
   }

diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.json b/frappe/desk/doctype/module_onboarding/module_onboarding.json
@@ -82,7 +82,7 @@
   }
  ],
  "links": [],
- "modified": "2020-06-08 15:36:04.701049",
+ "modified": "2023-08-28 22:24:02.233272",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Module Onboarding",
@@ -106,12 +106,13 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "All",
+   "role": "Desk User",
    "share": 1
   }
  ],
  "read_only": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
diff --git a/frappe/desk/doctype/note/note.json b/frappe/desk/doctype/note/note.json
@@ -86,7 +86,7 @@
  "icon": "fa fa-file-text",
  "idx": 1,
  "links": [],
- "modified": "2023-04-24 16:07:03.281184",
+ "modified": "2023-08-28 20:23:59.424943",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Note",
@@ -122,21 +122,21 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "All"
+   "role": "Desk User"
   },
   {
    "create": 1,
    "delete": 1,
    "email": 1,
    "if_owner": 1,
-   "role": "All",
+   "role": "Desk User",
    "share": 1,
    "write": 1
   },
   {
    "permlevel": 1,
    "read": 1,
-   "role": "All"
+   "role": "Desk User"
   }
  ],
  "quick_entry": 1,