ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-06-18 18:16:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support table names in filter tags

Browse Source
This commit is contained in:
Jamie Curnow
2024-09-11 15:01:28 +10:00
parent 514520ce1a
commit 833dd23dce
2 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
backend/internal/entity/filters.go
View File

@ -7,21 +7,23 @@ import (
// GetFilterMap returns the filter map
func GetFilterMap(m interface{}, includeBaseEntity bool) map[string]model.FilterMapValue {
filterMap := tags.GetFilterMap(m)
if includeBaseEntity {
return mergeFilterMaps(tags.GetFilterMap(model.ModelBase{}), filterMap)
}
filterMap := tags.GetFilterMap(m, "")
// TODO: this is done in GetFilterMap isn't it?
// if includeBaseEntity {
// return mergeFilterMaps(tags.GetFilterMap(model.ModelBase{}, ""), filterMap)
// }
return filterMap
}
func mergeFilterMaps(m1 map[string]model.FilterMapValue, m2 map[string]model.FilterMapValue) map[string]model.FilterMapValue {
merged := make(map[string]model.FilterMapValue, 0)
for k, v := range m1 {
merged[k] = v
}
for key, value := range m2 {
merged[key] = value
}
return merged
}
// func mergeFilterMaps(m1 map[string]model.FilterMapValue, m2 map[string]model.FilterMapValue) map[string]model.FilterMapValue {
// merged := make(map[string]model.FilterMapValue, 0)
// for k, v := range m1 {
// merged[k] = v
// }
// for key, value := range m2 {
// merged[key] = value
// }
// return merged
// }