Merge pull request #565 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecEditTemplate.ps1

@@ -20,6 +20,9 @@ function Invoke-ExecEditTemplate {
             $Template = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq 'IntuneTemplate' and RowKey eq '$GUID'"
             $OriginalJSON = $Template.JSON
 
+            $TemplateData = $Template.JSON | ConvertFrom-Json
+            $TemplateType = $TemplateData.Type
+
             if ($Template.SHA) {
                 $NewGuid = [guid]::NewGuid().ToString()
             } else {
@@ -36,7 +39,7 @@ function Invoke-ExecEditTemplate {
                 RawJson      = $RawJSON
                 DisplayName  = $Request.Body.displayName
                 Description  = $Request.Body.description
-                templateType = $Template.Type
+                templateType = $TemplateType
                 Package      = $Template.Package
                 Headers      = $Request.Headers
             }

Modules/CIPPCore/Public/TenantGroups/Update-CIPPDynamicTenantGroups.ps1

@@ -198,6 +198,7 @@ function Update-CIPPDynamicTenantGroups {
                 $LogicOperator = if ($Group.RuleLogic -eq 'or') { ' -or ' } else { ' -and ' }
                 $WhereString = $WhereConditions -join $LogicOperator
                 Write-Information "Evaluating tenants with condition: $WhereString"
+                Write-LogMessage -API 'TenantGroups' -message "Evaluating tenants for group '$($Group.Name)' with condition: $WhereString" -sev Info
 
                 $ScriptBlock = [ScriptBlock]::Create($WhereString)
                 $MatchingTenants = $TenantObj | Where-Object $ScriptBlock