feat(api,ui): add state filter on worker model #3319
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Benjamin Coenen <[email protected]>
bnjjj
requested review from
fsamin,
richardlt,
sguiheux and
yesnault
as code owners
sguiheux
approved these changes
Sep 13, 2018
fsamin
requested changes
Sep 13, 2018
engine/api/worker/model.go
Outdated
| @@ -187,6 +217,10 @@ func LoadWorkerModelsByUser(db gorp.SqlExecutor, store cache.Store, user *sdk.Us | |||
| select %s from worker_model | |||
| JOIN "group" on worker_model.group_id = "group".id | |||
| where group_id = $2`, modelColumns, modelColumns) | |||
| if len(additionalFilters) > 0 { | |||
| query = fmt.Sprintf("%s AND %s", query, strings.Join(additionalFilters, " AND ")) | |||
yesnault
approved these changes
Sep 13, 2018
Signed-off-by: Benjamin Coenen <[email protected]>
fsamin
approved these changes
Sep 13, 2018
richardlt
reviewed
Sep 13, 2018
engine/api/worker/model.go
Outdated
| @@ -54,6 +55,14 @@ type dbResultWMS struct { | |||
| GroupName string `db:"groupname"` | |||
| } | |||
|
|
|||
| // LoadOptions represent load options to load worker model | |||
| type LoadOptions struct { | |||
There was a problem hiding this comment.
Why not a state type with four constants ?
Signed-off-by: Benjamin Coenen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Benjamin Coenen [email protected]
@ovh/cds