Skip to content

Commit 1b1ff42

Browse files
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev
2 parents 98a3ceb + 1aa1df2 commit 1b1ff42

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

Modules/CIPPCore/Public/Entrypoints/Invoke-ListLogs.ps1

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ function Invoke-ListLogs {
2121
}
2222
} elseif ($Request.Query.logentryid) {
2323
# Return single log entry by RowKey
24-
$Filter = "RowKey eq '{0}'" -f $Request.Query.logentryid
24+
$DateFilter = $Request.Query.DateFilter ?? (Get-Date -UFormat '%Y%m%d')
25+
$Filter = "RowKey eq '{0}'" -f $Request.Query.logentryid, $DateFilter
2526
$AllowedTenants = Test-CIPPAccess -Request $Request -TenantList
2627
Write-Host "Getting single log entry for RowKey: $($Request.Query.logentryid)"
2728

@@ -59,22 +60,23 @@ function Invoke-ListLogs {
5960
$Row.LogData | ConvertFrom-Json
6061
} else { $Row.LogData }
6162
[PSCustomObject]@{
62-
DateTime = $Row.Timestamp
63-
Tenant = $Row.Tenant
64-
API = $Row.API
65-
Message = $Row.Message
66-
User = $Row.Username
67-
Severity = $Row.Severity
68-
LogData = $LogData
69-
TenantID = if ($Row.TenantID -ne $null) {
63+
DateTime = $Row.Timestamp
64+
Tenant = $Row.Tenant
65+
API = $Row.API
66+
Message = $Row.Message
67+
User = $Row.Username
68+
Severity = $Row.Severity
69+
LogData = $LogData
70+
TenantID = if ($Row.TenantID -ne $null) {
7071
$Row.TenantID
7172
} else {
7273
'None'
7374
}
74-
AppId = $Row.AppId
75-
IP = $Row.IP
76-
RowKey = $Row.RowKey
77-
Standard = $StandardInfo
75+
AppId = $Row.AppId
76+
IP = $Row.IP
77+
RowKey = $Row.RowKey
78+
Standard = $StandardInfo
79+
DateFilter = $Row.PartitionKey
7880
}
7981
}
8082
}
@@ -164,6 +166,7 @@ function Invoke-ListLogs {
164166
IP = $Row.IP
165167
RowKey = $Row.RowKey
166168
StandardInfo = $StandardInfo
169+
DateFilter = $Row.PartitionKey
167170
}
168171
}
169172
}

Modules/CIPPCore/Public/Set-CIPPAssignedPolicy.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ function Set-CIPPAssignedPolicy {
7272
}
7373
)
7474
}
75+
'On' {
76+
# Do not assign to any group - used to turn on policy without assignments
77+
}
7578
default {
7679
# Use GroupIds if provided, otherwise resolve by name
7780
$resolvedGroupIds = @()

0 commit comments

Comments
 (0)