Merge pull request #480 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Domain Analyser/Push-DomainAnalyserTenant.ps1

@@ -100,6 +100,9 @@ function Push-DomainAnalyserTenant {
                                 $Domain.DkimSelectors = $OldDomain.DkimSelectors
                                 $Domain.MailProviders = $OldDomain.MailProviders
                             }
+                            # Fix tenant info in the event of a default domain name change in a tenant
+                            $Domain | Add-Member -MemberType NoteProperty -Name 'TenantId' -Value $TenantDomain.Tenant -Force
+                            $Domain | Add-Member -MemberType NoteProperty -Name 'TenantGUID' -Value $TenantDomain.TenantGUID -Force
                         }
                         # Return domain object to list
                         $TenantDomainObjects.Add($Domain)

Modules/CIPPCore/Public/New-CIPPAlertTemplate.ps1

@@ -31,7 +31,7 @@ function New-CIPPAlertTemplate {
         $Title = "CIPP Alert - Standard Drift Detected for $($Tenant)"
         $DataHTML = ($Data | ConvertTo-Html | Out-String).Replace('<table>', ' <table class="table-modern">')
         $IntroText = "<p>You've setup your instance to receive alerts when a tenant is drifting away from your standard. This seems to have happened! We've found the following deviations. </p>$dataHTML"
-        $ButtonUrl = "$CIPPURL/tenant/standards/manage-drift?tenantFilter=$($Tenant)&templateId=$($AuditLogLink)"
+        $ButtonUrl = "$CIPPURL/tenant/manage/drift?tenantFilter=$($Tenant)&templateId=$($AuditLogLink)"
         $ButtonText = 'Investigate and remediate deviations'
         $AfterButtonText = 'Click the button above to go to the logbook and investigate the deviations. You can also use the standards page to remediate the deviations.'
     }