diff --git a/server/web2py/applications/vidjil/controllers/sample_set.py b/server/web2py/applications/vidjil/controllers/sample_set.py index e215768ded849aea2847685dfdf2e645f7508372..f1a1958834bb5d952f50db3f71ef61c5624f0888 100644 --- a/server/web2py/applications/vidjil/controllers/sample_set.py +++ b/server/web2py/applications/vidjil/controllers/sample_set.py @@ -206,18 +206,13 @@ def all(): search, tags = parse_search(request.vars["filter"]) group_ids = get_involved_groups() - list = SampleSetList(type, page, step, tags=tags) - list.load_creator_names() - list.load_sample_information() - list.load_config_information() - if isAdmin or len(get_group_list(auth)) > 1: - list.load_permitted_groups() - list.load_anon_permissions() - result = list.get_values() + f = time.time() + slist = SampleSetList(type) # failsafe if filtered display all results step = len(list) if step is None else step page = 0 if page is None else page + result = slist.result factory = ModelFactory() helper = factory.get_instance(type=type)