17119: Merge branch 'master' into 17119-add-filter-groups

[arvados.git] / lib / controller / router / response.go

diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index e1fc2691a54c7783bd7044997d7011cbf0731121..03cdcf18d27e4fcf3df814ab3c652c3479456165 100644 (file)
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -31,6 +31,9 @@ func (rtr *router) responseOptions(opts interface{}) (responseOptions, error) {
        case *arvados.ListOptions:
                rOpts.Select = opts.Select
                rOpts.Count = opts.Count
+       case *arvados.GroupContentsOptions:
+               rOpts.Select = opts.Select
+               rOpts.Count = opts.Count
        }
        return rOpts, nil
 }
@@ -107,9 +110,9 @@ func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp i
                                rtr.mungeItemFields(item)
                                slice[i] = item
                        }
-                       if opts.Count == "none" {
-                               delete(tmp, "items_available")
-                       }
+               }
+               if opts.Count == "none" {
+                       delete(tmp, "items_available")
                }
        } else {
                tmp = applySelectParam(opts.Select, tmp)