Merge pull request #49 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-listStandardTemplates.ps1

@@ -13,12 +13,13 @@ Function Invoke-listStandardTemplates {
     $Table = Get-CippTable -tablename 'templates'
     $Filter = "PartitionKey eq 'StandardsTemplateV2'"
     $Templates = (Get-CIPPAzDataTableEntity @Table -Filter $Filter) | ForEach-Object {
-        $JSON = $_.JSON
+        $JSON = $_.JSON -replace '"Action":', '"action":'
         try {
             $RowKey = $_.RowKey
-            $data = $_.JSON | ConvertFrom-Json -Depth 100 -ErrorAction SilentlyContinue
+            $data = $JSON | ConvertFrom-Json -Depth 100 -ErrorAction SilentlyContinue
+
         } catch {
-            Write-Host "$($RowKey)"
+            Write-Host "$($RowKey) standard could not be loaded: $($_.Exception.Message)"
             return
         }
         $data | Add-Member -NotePropertyName 'GUID' -NotePropertyValue $_.GUID -Force

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardRetentionPolicy.ps1

@@ -19,7 +19,7 @@ function Invoke-CIPPStandardRetentionPolicyTag {
     $StateIsCorrect =   ($CurrentState.Name -eq $PolicyName) -and
                         ($CurrentState.RetentionEnabled -eq $true) -and
                         ($CurrentState.RetentionAction -eq 'PermanentlyDelete') -and
-                        ($CurrentState.AgeLimitForRetention -eq $Settings.AgeLimitForRetention) -and
+                        ($CurrentState.AgeLimitForRetention -eq ([timespan]::FromDays($Settings.AgeLimitForRetention))) -and
                         ($CurrentState.Type -eq 'DeletedItems') -and
                         ($PolicyState.RetentionPolicyTagLinks -contains $PolicyName)