Skip to content

[pull] dev from KelvinTegelaar:dev #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 3, 2025
Merged

[pull] dev from KelvinTegelaar:dev #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a65fa7
fixes subscription link
KelvinTegelaar Dec 3, 2025
fd465fb
Fixes #4982
KelvinTegelaar Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecBackendURLs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function Invoke-ExecBackendURLs {
#>
[CmdletBinding()]
param($Request, $TriggerMetadata)
$Subscription = ($env:WEBSITE_OWNER_NAME).split('+') | Select-Object -First 1
$Subscription = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
$SWAName = $env:WEBSITE_SITE_NAME -replace 'cipp', 'CIPP-SWA-'

# Write to the Azure Functions log stream.
Expand Down
5 changes: 2 additions & 3 deletions ...c/Entrypoints/HTTP Functions/Identity/Administration/Groups/Invoke-ListGroupTemplates.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ function Invoke-ListGroupTemplates {
$Table = Get-CippTable -tablename 'templates'
$Filter = "PartitionKey eq 'GroupTemplate'"
$Templates = (Get-CIPPAzDataTableEntity @Table -Filter $Filter) | ForEach-Object {
$data = $_.JSON | ConvertFrom-Json

$data = $_.JSON | ConvertFrom-Json -ErrorAction SilentlyContinue
# Normalize groupType to camelCase for consistent frontend handling
# Handle both stored normalized values and legacy values
$normalizedGroupType = switch -Wildcard ($data.groupType.ToLower()) {
$normalizedGroupType = switch -Wildcard ($data.groupType) {
# Already normalized values (most common)
'dynamicdistribution' { 'dynamicDistribution'; break }
'azurerole' { 'azureRole'; break }
Expand Down