View | Details | Raw Unified | Return to bug 44197 | Differences between
and this patch

Collapse All | Expand All

(-)a/oxse4ucs/univention-ox/udm/hooks.d/oxUserDefaults.py (-17 / +2 lines)
 Lines 51-74   class oxUserDefaults(simpleHook): Link Here 
51
	type = "oxUserDefaults"
51
	type = "oxUserDefaults"
52
	_ox_defaults = None
52
	_ox_defaults = None
53
	ox_property_list = ["oxAccess", "oxDisplayName", "oxLanguage", "oxTimeZone"]
53
	ox_property_list = ["oxAccess", "oxDisplayName", "oxLanguage", "oxTimeZone"]
54
	_lo = None
55
	_po = None
56
54
57
	def register_ldap_connection(self, lo, position):
55
	def ox_defaults(self, lo, pos):
58
		self._lo = lo
59
		self._po = position
60
61
	@property
62
	def ox_defaults(self):
63
		if not self._ox_defaults:
56
		if not self._ox_defaults:
64
			if self._lo and self._po:
65
				lo = self._lo
66
				pos = self._po
67
			else:
68
				try:
69
					lo, pos = univention.admin.uldap.getAdminConnection()
70
				except:  # OX-Bug 48697: catch all exceptions - it is sufficient if one of both calls is successful.
71
					lo, pos = univention.admin.uldap.getMachineConnection()
72
			univention.admin.modules.update()
57
			univention.admin.modules.update()
73
			ext_attr_module = univention.admin.modules.get("settings/extended_attribute")
58
			ext_attr_module = univention.admin.modules.get("settings/extended_attribute")
74
			univention.admin.modules.init(lo, pos, ext_attr_module)
59
			univention.admin.modules.init(lo, pos, ext_attr_module)
 Lines 86-92   def hook_open(self, module): Link Here 
86
		if not module.info:
71
		if not module.info:
87
			# UMC module init
72
			# UMC module init
88
			return
73
			return
89
		for k, v in self.ox_defaults.items():
74
		for k, v in self.ox_defaults(module.lo, module.position).items():
90
			if k not in module.info:
75
			if k not in module.info:
91
				# OX-Bug #45937
76
				# OX-Bug #45937
92
				# module.save() is called after hook_open(), so module.oldinfo already contains
77
				# module.save() is called after hook_open(), so module.oldinfo already contains

Return to bug 44197