Merge pull request #2680 from coreos-inc/catalog-fixes

Various small catalog fixes

endpoints/v2/__init__.py

@@ -62,7 +62,7 @@ def paginate(limit_kwarg_name='limit', offset_kwarg_name='offset',
         requested_limit = 0
 
       limit = max(min(requested_limit, _MAX_RESULTS_PER_PAGE), 1)
-      next_page_token = request.args.get('next_page', None)
+      next_page_token = request.args.get('next_page', request.args.get('last', None))
 
       # Decrypt the next page token, if any.
       offset = 0

endpoints/v2/catalog.py

@@ -1,3 +1,5 @@
+import features
+
 from flask import jsonify
 
 from auth.registry_jwt_auth import process_registry_jwt_auth, get_granted_entity
@@ -15,8 +17,9 @@ def catalog_search(limit, offset, pagination_callback):
   if entity:
     username = entity.user.username
 
+  include_public = bool(features.PUBLIC_CATALOG)
   visible_repositories = model.get_visible_repositories(username, limit+1, offset,
-                                                        include_public=True)
+                                                        include_public=include_public)
   response = jsonify({
     'repositories': ['%s/%s' % (repo.namespace_name, repo.name)
                      for repo in visible_repositories][0:limit],