Attachment 8214 Details for Bug 42658 – patch

[patch] patch

42658.patch (text/plain), 1.42 KB, created by Florian Best on 2016-11-10 14:05:27 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-11-10 14:05:27 CET

Size: 1.42 KB

patch

obsolete

>diff --git a/ucs-school-lib/python/__init__.py b/ucs-school-lib/python/__init__.py
>index bbd71d9..343511e 100644
>--- a/ucs-school-lib/python/__init__.py
>+++ b/ucs-school-lib/python/__init__.py
>@@ -31,4 +31,8 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+import univention.admin.modules as udm_modules
>+
>+udm_modules.update()  # for school_ldap and models/
>+
> from ucsschool.lib.schoolldap import *
>diff --git a/ucs-school-lib/python/models/__init__.py b/ucs-school-lib/python/models/__init__.py
>index 3fd2b3f..6d35eb0 100644
>--- a/ucs-school-lib/python/models/__init__.py
>+++ b/ucs-school-lib/python/models/__init__.py
>@@ -30,10 +30,6 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>-import univention.admin.modules as udm_modules
>-
>-udm_modules.update()
>-
> from ucsschool.lib.models.school import *
> from ucsschool.lib.models.user import *
> from ucsschool.lib.models.group import *
>diff --git a/ucs-school-lib/python/schoolldap.py b/ucs-school-lib/python/schoolldap.py
>index 45f4a82..768f6a7 100644
>--- a/ucs-school-lib/python/schoolldap.py
>+++ b/ucs-school-lib/python/schoolldap.py
>@@ -54,9 +54,6 @@
> from univention.management.console.modules.decorators import sanitize
> from univention.management.console.modules.sanitizers import StringSanitizer
> 
>-# load UDM modules
>-udm_modules.update()
>-
> __bind_callback = None
> 
> _ = Translation('python-ucs-school').translate

Actions: View | Diff

Attachments on bug 42658: 8214