vikunja
/
vikunja
6
43
Fork 72
Code Issues 150 Pull Requests 19 Packages Releases 32 Activity

Fix exposed json variables of filters
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
kolaente 2020-09-07 17:32:55 +02:00
parent c85cb4936f
commit 0691083646
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
4 changed files with 35 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/models/task_collection.go
View File

@ -24,29 +24,29 @@ import (
// TaskCollection is a struct used to hold filter details and not clutter the Task struct with information not related to actual tasks. // TaskCollection is a struct used to hold filter details and not clutter the Task struct with information not related to actual tasks.
type TaskCollection struct { type TaskCollection struct {
ListID int64 `param:"list"` ListID int64 `param:"list" json:"-"`
Lists []*List Lists []*List `json:"-"`
// The query parameter to sort by. This is for ex. done, priority, etc. // The query parameter to sort by. This is for ex. done, priority, etc.
SortBy []string `query:"sort_by"` SortBy []string `query:"sort_by" json:"sort_by"`
SortByArr []string `query:"sort_by[]"` SortByArr []string `query:"sort_by[]" json:"-"`
// The query parameter to order the items by. This can be either asc or desc, with asc being the default. // The query parameter to order the items by. This can be either asc or desc, with asc being the default.
OrderBy []string `query:"order_by"` OrderBy []string `query:"order_by" json:"order_by"`
OrderByArr []string `query:"order_by[]"` OrderByArr []string `query:"order_by[]" json:"-"`
// The field name of the field to filter by // The field name of the field to filter by
FilterBy []string `query:"filter_by"` FilterBy []string `query:"filter_by" json:"filter_by"`
FilterByArr []string `query:"filter_by[]"` FilterByArr []string `query:"filter_by[]" json:"-"`
// The value of the field name to filter by // The value of the field name to filter by
FilterValue []string `query:"filter_value"` FilterValue []string `query:"filter_value" json:"filter_value"`
FilterValueArr []string `query:"filter_value[]"` FilterValueArr []string `query:"filter_value[]" json:"-"`
// The comparator for field and value // The comparator for field and value
FilterComparator []string `query:"filter_comparator"` FilterComparator []string `query:"filter_comparator" json:"filter_comparator"`
FilterComparatorArr []string `query:"filter_comparator[]"` FilterComparatorArr []string `query:"filter_comparator[]" json:"-"`
// The way all filter conditions are concatenated together, can be either "and" or "or"., // The way all filter conditions are concatenated together, can be either "and" or "or".,
FilterConcat string `query:"filter_concat"` FilterConcat string `query:"filter_concat" json:"filter_concat"`
// If set to true, the result will also include null values // If set to true, the result will also include null values
FilterIncludeNulls bool `query:"filter_include_nulls"` FilterIncludeNulls bool `query:"filter_include_nulls" json:"filter_include_nulls"`
web.CRUDable `xorm:"-" json:"-"` web.CRUDable `xorm:"-" json:"-"`
web.Rights `xorm:"-" json:"-"` web.Rights `xorm:"-" json:"-"`

53
pkg/swagger/docs.go
View File

@ -7141,87 +7141,48 @@ var doc = `{
"models.TaskCollection": { "models.TaskCollection": {
"type": "object", "type": "object",
"properties": { "properties": {
"filterBy": { "filter_by": {
"description": "The field name of the field to filter by", "description": "The field name of the field to filter by",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
}, },
"filterByArr": { "filter_comparator": {
"type": "array",
"items": {
"type": "string"
}
},
"filterComparator": {
"description": "The comparator for field and value", "description": "The comparator for field and value",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
}, },
"filterComparatorArr": { "filter_concat": {
"type": "array",
"items": {
"type": "string"
}
},
"filterConcat": {
"description": "The way all filter conditions are concatenated together, can be either \"and\" or \"or\".,", "description": "The way all filter conditions are concatenated together, can be either \"and\" or \"or\".,",
"type": "string" "type": "string"
}, },
"filterIncludeNulls": { "filter_include_nulls": {
"description": "If set to true, the result will also include null values", "description": "If set to true, the result will also include null values",
"type": "boolean" "type": "boolean"
}, },
"filterValue": { "filter_value": {
"description": "The value of the field name to filter by", "description": "The value of the field name to filter by",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
}, },
"filterValueArr": { "order_by": {
"type": "array",
"items": {
"type": "string"
}
},
"listID": {
"type": "integer"
},
"lists": {
"type": "array",
"items": {
"$ref": "#/definitions/models.List"
}
},
"orderBy": {
"description": "The query parameter to order the items by. This can be either asc or desc, with asc being the default.", "description": "The query parameter to order the items by. This can be either asc or desc, with asc being the default.",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
}, },
"orderByArr": { "sort_by": {
"type": "array",
"items": {
"type": "string"
}
},
"sortBy": {
"description": "The query parameter to sort by. This is for ex. done, priority, etc.", "description": "The query parameter to sort by. This is for ex. done, priority, etc.",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
},
"sortByArr": {
"type": "array",
"items": {
"type": "string"
}
} }
} }
}, },

53
pkg/swagger/swagger.json
View File

@ -7124,87 +7124,48 @@
"models.TaskCollection": { "models.TaskCollection": {
"type": "object", "type": "object",
"properties": { "properties": {
"filterBy": { "filter_by": {
"description": "The field name of the field to filter by", "description": "The field name of the field to filter by",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
}, },
"filterByArr": { "filter_comparator": {
"type": "array",
"items": {
"type": "string"
}
},
"filterComparator": {
"description": "The comparator for field and value", "description": "The comparator for field and value",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
}, },
"filterComparatorArr": { "filter_concat": {
"type": "array",
"items": {
"type": "string"
}
},
"filterConcat": {
"description": "The way all filter conditions are concatenated together, can be either \"and\" or \"or\".,", "description": "The way all filter conditions are concatenated together, can be either \"and\" or \"or\".,",
"type": "string" "type": "string"
}, },
"filterIncludeNulls": { "filter_include_nulls": {
"description": "If set to true, the result will also include null values", "description": "If set to true, the result will also include null values",
"type": "boolean" "type": "boolean"
}, },
"filterValue": { "filter_value": {
"description": "The value of the field name to filter by", "description": "The value of the field name to filter by",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
}, },
"filterValueArr": { "order_by": {
"type": "array",
"items": {
"type": "string"
}
},
"listID": {
"type": "integer"
},
"lists": {
"type": "array",
"items": {
"$ref": "#/definitions/models.List"
}
},
"orderBy": {
"description": "The query parameter to order the items by. This can be either asc or desc, with asc being the default.", "description": "The query parameter to order the items by. This can be either asc or desc, with asc being the default.",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
}, },
"orderByArr": { "sort_by": {
"type": "array",
"items": {
"type": "string"
}
},
"sortBy": {
"description": "The query parameter to sort by. This is for ex. done, priority, etc.", "description": "The query parameter to sort by. This is for ex. done, priority, etc.",
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"
} }
},
"sortByArr": {
"type": "array",
"items": {
"type": "string"
}
} }
} }
}, },

40
pkg/swagger/swagger.yaml
View File

@ -589,63 +589,37 @@ definitions:
type: object type: object
models.TaskCollection: models.TaskCollection:
properties: properties:
filterBy: filter_by:
description: The field name of the field to filter by description: The field name of the field to filter by
items: items:
type: string type: string
type: array type: array
filterByArr: filter_comparator:
items:
type: string
type: array
filterComparator:
description: The comparator for field and value description: The comparator for field and value
items: items:
type: string type: string
type: array type: array
filterComparatorArr: filter_concat:
items:
type: string
type: array
filterConcat:
description: The way all filter conditions are concatenated together, can be either "and" or "or"., description: The way all filter conditions are concatenated together, can be either "and" or "or".,
type: string type: string
filterIncludeNulls: filter_include_nulls:
description: If set to true, the result will also include null values description: If set to true, the result will also include null values
type: boolean type: boolean
filterValue: filter_value:
description: The value of the field name to filter by description: The value of the field name to filter by
items: items:
type: string type: string
type: array type: array
filterValueArr: order_by:
items:
type: string
type: array
listID:
type: integer
lists:
items:
$ref: '#/definitions/models.List'
type: array
orderBy:
description: The query parameter to order the items by. This can be either asc or desc, with asc being the default. description: The query parameter to order the items by. This can be either asc or desc, with asc being the default.
items: items:
type: string type: string
type: array type: array
orderByArr: sort_by:
items:
type: string
type: array
sortBy:
description: The query parameter to sort by. This is for ex. done, priority, etc. description: The query parameter to sort by. This is for ex. done, priority, etc.
items: items:
type: string type: string
type: array type: array
sortByArr:
items:
type: string
type: array
type: object type: object
models.TaskComment: models.TaskComment:
properties: properties: