Attachment 8837 Details for Bug 44197

[patch] patch

44197-2.patch (text/plain), 1.48 KB, created by Florian Best on 2017-05-10 17:51 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-05-10 17:51 CEST

Size: 1.48 KB

patch

obsolete

>diff --git a/oxse4ucs/univention-ox/udm/hooks.d/oxUserDefaults.py b/oxse4ucs/univention-ox/udm/hooks.d/oxUserDefaults.py
>index 49a0dc3..d21ec27 100644
>--- a/oxse4ucs/univention-ox/udm/hooks.d/oxUserDefaults.py
>+++ b/oxse4ucs/univention-ox/udm/hooks.d/oxUserDefaults.py
>@@ -51,24 +51,9 @@ class oxUserDefaults(simpleHook):
> 	type = "oxUserDefaults"
> 	_ox_defaults = None
> 	ox_property_list = ["oxAccess", "oxDisplayName", "oxLanguage", "oxTimeZone"]
>-	_lo = None
>-	_po = None
> 
>-	def register_ldap_connection(self, lo, position):
>-		self._lo = lo
>-		self._po = position
>-
>-	@property
>-	def ox_defaults(self):
>+	def ox_defaults(self, lo, pos):
> 		if not self._ox_defaults:
>-			if self._lo and self._po:
>-				lo = self._lo
>-				pos = self._po
>-			else:
>-				try:
>-					lo, pos = univention.admin.uldap.getAdminConnection()
>-				except:  # OX-Bug 48697: catch all exceptions - it is sufficient if one of both calls is successful.
>-					lo, pos = univention.admin.uldap.getMachineConnection()
> 			univention.admin.modules.update()
> 			ext_attr_module = univention.admin.modules.get("settings/extended_attribute")
> 			univention.admin.modules.init(lo, pos, ext_attr_module)
>@@ -86,7 +71,7 @@ def hook_open(self, module):
> 		if not module.info:
> 			# UMC module init
> 			return
>-		for k, v in self.ox_defaults.items():
>+		for k, v in self.ox_defaults(module.lo, module.position).items():
> 			if k not in module.info:
> 				# OX-Bug #45937
> 				# module.save() is called after hook_open(), so module.oldinfo already contains

Actions: View | Diff

Attachments on bug 44197: 8830 | 8837