From 3ded66b32acd0f37aafc0b541b75fc7dc44f2f3c Mon Sep 17 00:00:00 2001 From: Pedro Nasser Date: Thu, 11 Aug 2016 02:18:02 -0300 Subject: [PATCH] fix filter and added postgres --- api/datastore/postgres/postgres.go | 4 ++++ api/models/datastore.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/api/datastore/postgres/postgres.go b/api/datastore/postgres/postgres.go index 21b44105f..ffa6b962b 100644 --- a/api/datastore/postgres/postgres.go +++ b/api/datastore/postgres/postgres.go @@ -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) diff --git a/api/models/datastore.go b/api/models/datastore.go index 2955e3bd4..81a63f1bd 100644 --- a/api/models/datastore.go +++ b/api/models/datastore.go @@ -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) }