test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflict

Browse Source
This commit is contained in:
Shariq Ansari 2025-04-13 20:09:49 +05:30 committed by GitHub
parent 7858ce7095
commit 1500c3f2b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crm/api/__init__.py
View File

@ -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