Commit fb213aa2 authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

Merge branch 'md/add-results-count'

parents 2d3b74be d5231cee

rpc/methods.py

+8 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,12 @@ def advanced_search( 
    _check_project_permission(user, project, PERM_RESOURCE_READ)

    public_only = _user_has_permission(user, project, PERM_COLLECTION_PUBLIC_ONLY)

    # TODO: add tags search

    results = {"collections": [], "resources": []}

    results = {

        "collections": [],

        "resources": [],

        "collections_count": 0,

        "resources_count": 0,

    }



    # Search Resources first

    resources_set = Resource.objects.filter(
@@ -1184,6 +1189,7 @@ def advanced_search( 
                tags__uid__in=search_term["exclude_tags"]

            )

    serializer_cache = SerializerCache()

    results["resources_count"] = resources_set.distinct().count()

    for resource_instance in resources_set.distinct().order_by(order_by)[

        limit_from:limit_to

    ]:
@@ -1248,6 +1254,7 @@ def advanced_search( 
                tags__uid__in=search_term["exclude_tags"]

            )

    serializer_cache = SerializerCache()

    results["collections_count"] = collections_set.distinct().count()

    for collection_instance in collections_set.distinct().order_by(order_by)[

        limit_from:limit_to

    ]: