View | Details | Raw Unified | Return to bug 49311
Collapse All | Expand All

(-)/usr/share/pyshared/ucsschool/lib/models/computer.py.bak (-1 / +8 lines)
 Lines 290-296    Link Here 
290
	@classmethod
290
	@classmethod
291
	def from_udm_obj(cls, udm_obj, school, lo):
291
	def from_udm_obj(cls, udm_obj, school, lo):
292
		from ucsschool.lib.models.school import School
292
		from ucsschool.lib.models.school import School
293
		obj = super(SchoolComputer, cls).from_udm_obj(udm_obj, school, lo)
293
		try:
294
			obj = super(SchoolComputer, cls).from_udm_obj(udm_obj, school, lo)
295
		except KeyError:
296
#			raise
297
			import univention
298
			x = univention.admin.modules.get(udm_obj.module)
299
			univention.admin.modules.init(lo, univention.admin.uldap.getMachineConnection()[1], x)
300
			obj = super(SchoolComputer, cls).from_udm_obj(udm_obj, school, lo)
294
		obj.ip_address = udm_obj['ip']
301
		obj.ip_address = udm_obj['ip']
295
		school_obj = School.cache(obj.school)
302
		school_obj = School.cache(obj.school)
296
		edukativnetz_group = school_obj.get_administrative_group_name('educational', domain_controller=False, as_dn=True)
303
		edukativnetz_group = school_obj.get_administrative_group_name('educational', domain_controller=False, as_dn=True)

Return to bug 49311