alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix filter and added postgres

Browse Source
This commit is contained in:
Pedro Nasser
2016-08-11 02:18:02 -03:00
parent 39f59620aa
commit 3ded66b32a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/datastore/postgres/postgres.go
View File

@@ -275,6 +275,10 @@ func buildFilterQuery(filter *models.RouteFilter) string {
filterQueries = append(filterQueries, fmt.Sprintf("app_name = '%s'", filter.AppName))
}
if filter.Image != "" {
filterQueries = append(filterQueries, fmt.Sprintf("image = '%s'", filter.Image))
}
for i, field := range filterQueries {
if i == 0 {
filterQuery = fmt.Sprintf("WHERE %s ", field)

2
api/models/datastore.go
View File

@@ -33,5 +33,5 @@ func ApplyAppFilter(app *App, filter *AppFilter) bool {
func ApplyRouteFilter(route *Route, filter *RouteFilter) bool {
return (filter.Path == "" || route.Path == filter.Path) &&
(filter.AppName == "" || route.AppName == filter.AppName) &&
(filter.Image == "" || route.Image == filter.Image) &&
(filter.Image == "" || route.Image == filter.Image)
}