From 56513bbdb121aa654cff9bbb28241addbf0fb7ab Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Sun, 13 Aug 2017 23:18:18 +0200 Subject: [PATCH] [mod] we never used those filtering/offset things --- data/actionsmap/yunohost.yml | 12 ------------ src/yunohost/domain.py | 17 ++++------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml index 24b099451..b3df2aa58 100644 --- a/data/actionsmap/yunohost.yml +++ b/data/actionsmap/yunohost.yml @@ -241,18 +241,6 @@ domain: configuration: authenticate: all authenticator: ldap-anonymous - arguments: - -f: - full: --filter - help: LDAP filter used to search - -l: - full: --limit - help: Maximum number of domain fetched - type: int - -o: - full: --offset - help: Starting number for domain fetching - type: int ### domain_add() add: diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py index 4665f9905..d3884ce46 100644 --- a/src/yunohost/domain.py +++ b/src/yunohost/domain.py @@ -43,7 +43,7 @@ from yunohost.service import service_regen_conf logger = getActionLogger('yunohost.domain') -def domain_list(auth, filter=None, limit=None, offset=None): +def domain_list(auth): """ List domains @@ -55,19 +55,10 @@ def domain_list(auth, filter=None, limit=None, offset=None): """ result_list = [] - # Set default arguments values - if offset is None: - offset = 0 - if limit is None: - limit = 1000 - if filter is None: - filter = 'virtualdomain=*' + result = auth.search('ou=domains,dc=yunohost,dc=org', 'virtualdomain=*', ['virtualdomain']) - result = auth.search('ou=domains,dc=yunohost,dc=org', filter, ['virtualdomain']) - - if len(result) > offset and limit > 0: - for domain in result[offset:offset + limit]: - result_list.append(domain['virtualdomain'][0]) + for domain in result: + result_list.append(domain['virtualdomain'][0]) return {'domains': result_list}