Merge branch 'UAT' into v1.11.2

HDRUK · Apr 19, 2021 · 82ba85f · 82ba85f
2 parents 68d0768 + 3983716
commit 82ba85f
Show file tree

Hide file tree

Showing 6 changed files with 275 additions and 574 deletions.
diff --git a/src/resources/datarequest/datarequest.controller.js b/src/resources/datarequest/datarequest.controller.js
@@ -2103,7 +2103,10 @@ module.exports = {
 			case constants.notificationTypes.SUBMITTED:
 				// 1. Create notifications
 				// Custodian notification
-				if (_.has(accessRecord.datasets[0].toObject(), 'publisher.team.users')) {
+				if (
+					_.has(accessRecord.datasets[0].toObject(), 'publisher.team.users') &&
+					accessRecord.datasets[0].publisher.allowAccessRequestManagement
+				) {
 					// Retrieve all custodian user Ids to generate notifications
 					custodianManagers = teamController.getTeamMembersByRole(accessRecord.datasets[0].publisher.team, constants.roleTypes.MANAGER);
 					custodianUserIds = custodianManagers.map(user => user.id);