From 7858ce7095e1aba549c28266d39ead9bad608a20 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Sun, 13 Apr 2025 19:59:23 +0530 Subject: [PATCH 1/2] fix: restrict app in apps page if no access to FCRM module (cherry picked from commit 3881179f723ce21986ba8a683ef5ab9d851e7aae) # Conflicts: # crm/api/__init__.py --- crm/api/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crm/api/__init__.py b/crm/api/__init__.py index 107282c3..305fd3bd 100644 --- a/crm/api/__init__.py +++ b/crm/api/__init__.py @@ -64,7 +64,11 @@ def check_app_permission(): if frappe.session.user == "Administrator": return True +<<<<<<< HEAD allowed_modules = get_modules_from_all_apps_for_user() +======= + allowed_modules = frappe.utils.modules.get_modules_from_all_apps_for_user() +>>>>>>> 3881179 (fix: restrict app in apps page if no access to FCRM module) allowed_modules = [x["module_name"] for x in allowed_modules] if "FCRM" not in allowed_modules: return False From 1500c3f2b06101b239dca8ebdf7b65c90fb59582 Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Sun, 13 Apr 2025 20:09:49 +0530 Subject: [PATCH 2/2] chore: resolved conflict --- crm/api/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/crm/api/__init__.py b/crm/api/__init__.py index 305fd3bd..2f83d86a 100644 --- a/crm/api/__init__.py +++ b/crm/api/__init__.py @@ -3,7 +3,6 @@ from bs4 import BeautifulSoup from frappe.core.api.file import get_max_file_size from frappe.translate import get_all_translations from frappe.utils import cstr, split_emails, validate_email_address -from frappe.utils.modules import get_modules_from_all_apps_for_user from frappe.utils.telemetry import POSTHOG_HOST_FIELD, POSTHOG_PROJECT_FIELD @@ -64,11 +63,7 @@ def check_app_permission(): if frappe.session.user == "Administrator": return True -<<<<<<< HEAD - allowed_modules = get_modules_from_all_apps_for_user() -======= allowed_modules = frappe.utils.modules.get_modules_from_all_apps_for_user() ->>>>>>> 3881179 (fix: restrict app in apps page if no access to FCRM module) allowed_modules = [x["module_name"] for x in allowed_modules] if "FCRM" not in allowed_modules: return False