From c324a7ac2d7d1e02851995d76e6b9d1f2e58a952 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Tue, 12 May 2020 13:14:02 +0530 Subject: [PATCH] fix: permission issues for website users --- .../doctype/frappe_app/frappe_app.json | 10 +- .../doctype/portal_event/portal_event.json | 308 +++++------------- .../doctype/portal_job/portal_job.json | 12 +- .../web_form/jobs/jobs.json | 14 +- foundation/hooks.py | 2 - 5 files changed, 109 insertions(+), 237 deletions(-) diff --git a/foundation/erpnext_foundation/doctype/frappe_app/frappe_app.json b/foundation/erpnext_foundation/doctype/frappe_app/frappe_app.json index 6df31205..6c547ad4 100644 --- a/foundation/erpnext_foundation/doctype/frappe_app/frappe_app.json +++ b/foundation/erpnext_foundation/doctype/frappe_app/frappe_app.json @@ -80,7 +80,7 @@ } ], "links": [], - "modified": "2020-01-20 20:25:49.139080", + "modified": "2020-05-12 12:49:28.878533", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Frappe App", @@ -97,6 +97,14 @@ "role": "System Manager", "share": 1, "write": 1 + }, + { + "create": 1, + "delete": 1, + "if_owner": 1, + "read": 1, + "role": "All", + "write": 1 } ], "quick_entry": 1, diff --git a/foundation/erpnext_foundation/doctype/portal_event/portal_event.json b/foundation/erpnext_foundation/doctype/portal_event/portal_event.json index f3e1e4ce..44e9a78b 100644 --- a/foundation/erpnext_foundation/doctype/portal_event/portal_event.json +++ b/foundation/erpnext_foundation/doctype/portal_event/portal_event.json @@ -1,240 +1,96 @@ { - "allow_copy": 0, - "allow_guest_to_view": 1, - "allow_import": 0, - "allow_rename": 0, - "autoname": "field:event_title", - "beta": 0, - "creation": "2017-03-02 14:37:01.391536", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "actions": [], + "allow_guest_to_view": 1, + "autoname": "field:event_title", + "creation": "2017-03-02 14:37:01.391536", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "event_title", + "event_date", + "place", + "details", + "published", + "route" + ], "fields": [ { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "event_title", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 1, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Event Title", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "event_title", + "fieldtype": "Data", + "in_global_search": 1, + "in_list_view": 1, + "label": "Event Title", + "reqd": 1, + "unique": 1 + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "event_date", - "fieldtype": "Date", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Event Date", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "event_date", + "fieldtype": "Date", + "in_list_view": 1, + "label": "Event Date", + "reqd": 1 + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "place", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Place", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "place", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Place", + "reqd": 1 + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "details", - "fieldtype": "Text Editor", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 1, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Details", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "details", + "fieldtype": "Text Editor", + "in_global_search": 1, + "label": "Details" + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "published", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Published", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "default": "0", + "fieldname": "published", + "fieldtype": "Check", + "label": "Published" + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "route", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Route", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "fieldname": "route", + "fieldtype": "Data", + "label": "Route", + "read_only": 1 } - ], - "has_web_view": 1, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_published_field": "published", - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2017-03-06 16:05:19.014553", - "modified_by": "Administrator", - "module": "ERPNext Foundation", - "name": "Portal Event", - "name_case": "", - "owner": "Administrator", + ], + "has_web_view": 1, + "is_published_field": "published", + "links": [], + "modified": "2020-05-12 13:12:59.178340", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "Portal Event", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "if_owner": 1, + "read": 1, + "role": "All", "write": 1 } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "route": "events", - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "title_field": "event_title", - "track_changes": 1, - "track_seen": 0 + ], + "quick_entry": 1, + "route": "events", + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "event_title", + "track_changes": 1 } \ No newline at end of file diff --git a/foundation/erpnext_foundation/doctype/portal_job/portal_job.json b/foundation/erpnext_foundation/doctype/portal_job/portal_job.json index bb597ccd..c8d3da90 100644 --- a/foundation/erpnext_foundation/doctype/portal_job/portal_job.json +++ b/foundation/erpnext_foundation/doctype/portal_job/portal_job.json @@ -1,4 +1,5 @@ { + "actions": [], "creation": "2017-02-24 12:06:02.509773", "doctype": "DocType", "editable_grid": 1, @@ -69,7 +70,8 @@ ], "has_web_view": 1, "is_published_field": "show_in_website", - "modified": "2019-11-06 12:36:35.982037", + "links": [], + "modified": "2020-05-12 12:29:25.301878", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Portal Job", @@ -86,6 +88,14 @@ "role": "System Manager", "share": 1, "write": 1 + }, + { + "create": 1, + "delete": 1, + "if_owner": 1, + "read": 1, + "role": "All", + "write": 1 } ], "quick_entry": 1, diff --git a/foundation/erpnext_foundation/web_form/jobs/jobs.json b/foundation/erpnext_foundation/web_form/jobs/jobs.json index b5049195..81bc40c7 100644 --- a/foundation/erpnext_foundation/web_form/jobs/jobs.json +++ b/foundation/erpnext_foundation/web_form/jobs/jobs.json @@ -17,7 +17,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2019-11-06 12:31:16.600174", + "modified": "2020-05-12 12:52:21.038425", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "jobs", @@ -55,7 +55,7 @@ "max_value": 0, "options": "Setup\nImplementation\nTraining\nCustomization\nPrint Format\nIntegration\nFeature Development\nApp Development", "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { @@ -68,7 +68,7 @@ "max_value": 0, "options": "Open\nCompleted\nDeveloper Hired\nExpired\nWithdrawn", "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { @@ -81,7 +81,7 @@ "max_value": 0, "options": "Country", "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { @@ -93,7 +93,7 @@ "max_length": 0, "max_value": 0, "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { @@ -106,7 +106,7 @@ "max_value": 0, "options": "", "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 }, { @@ -118,7 +118,7 @@ "max_length": 0, "max_value": 0, "read_only": 0, - "reqd": 0, + "reqd": 1, "show_in_filter": 0 } ] diff --git a/foundation/hooks.py b/foundation/hooks.py index cef02693..efb50250 100644 --- a/foundation/hooks.py +++ b/foundation/hooks.py @@ -91,9 +91,7 @@ website_context = { portal_menu_items = [ {'label': 'My Profile', 'route': '/service-provider-settings'}, - {'label': 'Module Leader', 'route': '/module-leader-settings'}, {'label': 'Membership', 'route': '/members/details'}, - {'label': 'Conference Talks', 'route': '/conference-talk-proposal'}, {'label': 'Jobs', 'route': '/my-jobs'}, {'label': 'Events', 'route': '/add-event'}, {'label': 'Apps', 'route': '/submit-app'},