Attachment 7737 Details for Bug 36921

[patch] patch

36921.patch (text/plain), 1.26 KB, created by Florian Best on 2016-06-13 12:10 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-06-13 12:10 CEST

Size: 1.26 KB

patch

obsolete

>diff --git a/ucs-school-umc-wizards/umc/python/schoolwizards/__init__.py b/ucs-school-umc-wizards/umc/python/schoolwizards/__init__.py
>index 50256d3..ab5e282 100644
>--- a/ucs-school-umc-wizards/umc/python/schoolwizards/__init__.py
>+++ b/ucs-school-umc-wizards/umc/python/schoolwizards/__init__.py
>@@ -38,7 +38,7 @@ from univention.lib.i18n import Translation
> from univention.management.console.log import MODULE
> from univention.management.console.modules.decorators import simple_response, sanitize
> from univention.management.console.modules.sanitizers import StringSanitizer
>-from univention.admin.uexceptions import base as uldapBaseException
>+from univention.admin.uexceptions import base as uldapBaseException, noObject
> import univention.admin.modules as udm_modules
> 
> from ucsschool.lib.schoolldap import SchoolBaseModule, LDAP_Connection, USER_READ, USER_WRITE
>@@ -228,7 +228,10 @@ class Instance(SchoolBaseModule, SchoolImport):
> 			schools = School.from_binddn(lo)
> 		objs = []
> 		for school in schools:
>-			objs.extend(klass.get_all(lo, school.name, filter_str=filter_str, easy_filter=True))
>+			try:
>+				objs.extend(klass.get_all(lo, school.name, filter_str=filter_str, easy_filter=True))
>+			except noObject:
>+				pass
> 		return [obj.to_dict() for obj in objs]
> 
> 	@response

Actions: View | Diff

Attachments on bug 36921: 7737