Skip to content

Commit e5df5ce

Browse files
committed
fix: fixing undefined access grant failed message
1 parent 651b552 commit e5df5ce

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

Access/base_email_access/access.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ def revoke_owner(self):
2424

2525
# Override in module for specific person who should mark access as revoked
2626
def access_mark_revoke_permission(self, access_type):
27-
# TODO: define ACCESS_REVOKE_PERMISSIONS_MAPPING
28-
return ACCESS_REVOKE_PERMISSIONS_MAPPING["security"]
27+
return ACCESS_APPROVE_EMAIL
2928

3029
# module's tag() method should return a tag present in
3130
# hash returned by access_types() "type" key

Access/notifications.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,19 @@ def send_membership_accepted_notification(user, group, membership):
7272
general.emailSES(destination, subject, body)
7373

7474

75-
def send_mulitple_membership_accepted_notification(user_names, group, membership):
76-
subject = MEMBERSHIP_ACCEPTED_SUBJECT.format(user_names, group.name)
77-
body = helpers.generateStringFromTemplate(
78-
filename="membershipAcceptedEmailBody.html",
79-
user_name=",".join(user_names),
80-
group_name=group.name,
81-
approver=membership.approver.name,
82-
)
83-
destination = []
84-
destination.append(membership.requested_by.email)
85-
destination.append(user_names)
86-
general.emailSES(destination, subject, body)
75+
def send_mulitple_membership_accepted_notification(all_user_emails, group_name, membership):
76+
for each_user_email in all_user_emails.keys():
77+
subject = MEMBERSHIP_ACCEPTED_SUBJECT.format(each_user_email, group_name)
78+
body = helpers.generateStringFromTemplate(
79+
filename="membershipAcceptedEmailBody.html",
80+
user_name=",".join(each_user_email),
81+
group_name=group_name,
82+
approver=membership.approver.name,
83+
)
84+
destination = []
85+
destination.append(membership.requested_by.email)
86+
destination.append(each_user_email)
87+
general.emailSES(destination, subject, body)
8788

8889

8990
def generateGroupMemberTable(memberList):

Access/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ def group_access_list(request, group_name):
251251

252252
return render(request, "EnigmaOps/groupAccessList.html", context)
253253
except Exception as ex:
254-
logger.debug(
255-
"Error in request not found OR Invalid request type, Error: %s", str(ex)
254+
logger.exception(
255+
"Error in Group Access List, Error: %s", str(ex)
256256
)
257257
json_response = {}
258258
json_response["error"] = {

templates/EnigmaOps/group_access_list_tabs/users_list_tab.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
'form-control',
1414
'form-control',
1515
'form-control',
16+
'form-control',
1617
'form-control'
1718
]
1819

0 commit comments

Comments
 (0)