Skip to content

Commit f840ba0

Browse files
committed
Update permissions for Deals and Reminders in main menu data and tests
1 parent 6192e01 commit f840ba0

File tree

2 files changed

+8
-31
lines changed

2 files changed

+8
-31
lines changed

tests/main_menu_data.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def get_contact_model_data(prefix: str = '',
7070

7171

7272
def get_deal_model_data(prefix: str = '',
73-
perms: dict = {}, # NOQA
73+
perms: dict = {'add':False}, # NOQA
7474
view_only: bool = True,
7575
is_add_url: bool = False,
7676
) -> dict:
@@ -142,15 +142,15 @@ def get_publicemaildomain_model_data(name: str = '', prefix: str = '') -> dict:
142142
}
143143

144144

145-
def get_reminder_model_data(name: str = '', prefix: str = '') -> dict:
145+
def get_reminder_model_data(name: str = '', prefix: str = '', add: bool = False) -> dict:
146146
prefix = prefix or PREFIX
147147
name = name or "Reminders"
148148
return {
149149
'name': name,
150150
'object_name': 'Reminder',
151-
'perms': get_perms(),
151+
'perms': get_perms(add=add),
152152
'admin_url': f'/en/{prefix}common/reminder/',
153-
'add_url': f'/en/{prefix}common/reminder/add/',
153+
'add_url': f'/en/{prefix}common/reminder/add/' if add else None,
154154
'view_only': False
155155
}
156156

@@ -708,7 +708,7 @@ def get_task_app_data(add_models: tuple = tuple(), prefix: str = '') -> dict:
708708
'add_url': f'/en/{PREFIX}crm/currency/add/',
709709
'view_only': False
710710
},
711-
get_deal_model_data(is_add_url=True, view_only=False),
711+
get_deal_model_data(perms={'add': False}, view_only=False),
712712
{
713713
'name': 'Emails in CRM',
714714
'object_name': 'CrmEmail',
@@ -934,7 +934,7 @@ def get_task_app_data(add_models: tuple = tuple(), prefix: str = '') -> dict:
934934
add_models=(
935935
get_department_model_data(prefix=ADMIN_PREFIX),
936936
get_thefile_model_data(prefix=ADMIN_PREFIX),
937-
get_reminder_model_data(prefix=ADMIN_PREFIX),
937+
get_reminder_model_data(prefix=ADMIN_PREFIX, add=True),
938938
get_userprofile_model_data(
939939
prefix=ADMIN_PREFIX,
940940
perms={'add': True, 'change': True, 'delete': True, 'view': True},
@@ -993,7 +993,7 @@ def get_task_app_data(add_models: tuple = tuple(), prefix: str = '') -> dict:
993993
'view_only': False
994994
},
995995
get_deal_model_data(
996-
prefix=ADMIN_PREFIX, is_add_url=True, view_only=False
996+
prefix=ADMIN_PREFIX, is_add_url=False, view_only=False
997997
),
998998
{
999999
'name': 'Emails in CRM',

tests/test_base.py

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,6 @@ def test_apps_models_perms(self):
7373
))
7474
reminder_model['perms']['add'] = False
7575
reminder_model['add_url'] = None
76-
# Remove "add" permission for "Deals"
77-
if app['app_label'] == 'crm':
78-
deal_model = next((
79-
m for m in app['models']
80-
if m['object_name'] == 'Deal'
81-
), None)
82-
if deal_model:
83-
deal_model['perms']['add'] = False
84-
deal_model['add_url'] = None
8576
self.client.force_login(self.users.get(username=username))
8677

8778
response = self.client.get(
@@ -151,20 +142,6 @@ def test_admin_apps_models_perms(self):
151142
))
152143
reminder['perms']['add'] = False
153144
"""
154-
# Remove "add" permission for "Deals" in admin
155-
crm_app = next((
156-
a for a in correct_app_list
157-
if a['name'] == 'Crm'
158-
), None)
159-
if crm_app:
160-
deal_model = next((
161-
m for m in crm_app['models']
162-
if m['object_name'] == 'Deal'
163-
), None)
164-
if deal_model:
165-
deal_model['perms']['add'] = False
166-
deal_model['add_url'] = None
167-
168145
self.check_app_availability_and_model_permissions(username, correct_app_list, context_app_list)
169146

170147
def check_app_availability_and_model_permissions(self, username, correct_app_list, context_app_list):
@@ -233,4 +210,4 @@ def check_response(self, url: str, username: str) -> None:
233210
self.assertEqual(response.status_code, 200,
234211
"User {} got response status_code {} at url {}".format(
235212
username, response.status_code, url
236-
))
213+
))

0 commit comments

Comments
 (0)