kubesphere-add-default-param
This commit is contained in:
@@ -34,15 +34,10 @@ func ListResources(req *restful.Request, resp *restful.Response) {
|
|||||||
namespace := req.PathParameter("namespace")
|
namespace := req.PathParameter("namespace")
|
||||||
resourceName := req.PathParameter("resources")
|
resourceName := req.PathParameter("resources")
|
||||||
conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
|
conditions, err := params.ParseConditions(req.QueryParameter(params.ConditionsParam))
|
||||||
orderBy := req.QueryParameter(params.OrderByParam)
|
orderBy := params.GetStringValueWithDefault(req, params.OrderByParam, resources.CreateTime)
|
||||||
limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
|
limit, offset := params.ParsePaging(req.QueryParameter(params.PagingParam))
|
||||||
reverse := params.ParseReverse(req)
|
reverse := params.ParseReverse(req)
|
||||||
|
|
||||||
if orderBy == "" {
|
|
||||||
orderBy = resources.CreateTime
|
|
||||||
reverse = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
|
resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -89,3 +89,11 @@ type Conditions struct {
|
|||||||
Match map[string]string
|
Match map[string]string
|
||||||
Fuzzy map[string]string
|
Fuzzy map[string]string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetStringValueWithDefault(req *restful.Request, name string, dv string) string {
|
||||||
|
v := req.QueryParameter(name)
|
||||||
|
if v == "" {
|
||||||
|
v = dv
|
||||||
|
}
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user