Merge branch 'sprint-34' of https://github.com/Avanade/approval-system …

…into 92-implement-clean-arch-on-approval-system
Avanade · Sep 26, 2024 · b8e4ca3 · b8e4ca3
2 parents 7799a0f + 549a2f3
commit b8e4ca3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.github/workflows/setup-appservice-resource.yml b/.github/workflows/setup-appservice-resource.yml
@@ -40,6 +40,7 @@ jobs:
           parameters.appServiceSettings.value.EMAIL_CLIENT_SECRET : ${{ secrets.EMAIL_CLIENT_SECRET }}
           parameters.appServiceSettings.value.ENTERPRISE_OWNERS : ${{ secrets.ENTERPRISE_OWNERS }}
           parameters.appServiceSettings.value.EMAIL_USER_ID : ${{ secrets.EMAIL_USER_ID }}
+          parameters.appServiceSettings.value.LINK_FOOTERS : ${{ vars.LINK_FOOTERS }}
           parameters.appServiceSettings.value.DOCKER_REGISTRY_SERVER_URL : ${{ secrets.CONTAINER_REGISTRY_SERVER_URL }}
           parameters.appServiceSettings.value.DOCKER_REGISTRY_SERVER_USERNAME : ${{ secrets.CONTAINER_REGISTRY_SERVER_USERNAME }} 
           parameters.appServiceSettings.value.DOCKER_REGISTRY_SERVER_PASSWORD : ${{ secrets.CONTAINER_REGISTRY_SERVER_PASSWORD }}

diff --git a/src/goapp/service/item/item-service.go b/src/goapp/service/item/item-service.go
@@ -74,6 +74,10 @@ func (s *itemService) UpdateItemDateSent(itemId string) error {
 }
 
 func (s *itemService) removeEnterpriseOwnersInApprovers(approvers []string) []string {
+	if len(approvers) == 1 {
+		return approvers
+	}
+
 	ownersArray := s.configManager.GetEnterpriseOwners()
 	if len(ownersArray) == 0 {
 		return approvers