Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-30 10:49:40 +02:00
Code Issues Releases Activity

fix(edge-config): allow empty filter type EE-5962 (#10381)

Browse source
This commit is contained in:
cmeng 2023-09-26 13:49:25 +13:00 • committed by GitHub
parent 2dfa4a7c45
commit b4b44e6fa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/filesystem/serialize_per_dev_configs.go
View file

@ -80,10 +80,14 @@ func shouldIncludeEntry(dirEntry DirEntry, deviceName, configPath string, filter
return shouldIncludeFile(dirEntry, deviceName, configPath) return shouldIncludeFile(dirEntry, deviceName, configPath)
} }
// Include: if filterType == portainer.PerDevConfigsTypeDir {
// dir entry A/B/C/<deviceName> // Include:
// all entries A/B/C/<deviceName>/* // dir entry A/B/C/<deviceName>
return shouldIncludeDir(dirEntry, deviceName, configPath) // all entries A/B/C/<deviceName>/*
return shouldIncludeDir(dirEntry, deviceName, configPath)
}
return false
} }
func isInConfigRootDir(dirEntry DirEntry, configPath string) bool { func isInConfigRootDir(dirEntry DirEntry, configPath string) bool {