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

(-)a/ucs-school-lib/python/models/base.py (-4 / +4 lines)
 Lines 713-719   class UCSSchoolHelperAbstractClass(object): Link Here 
713
				except (noObject, IndexError):
713
				except (noObject, IndexError):
714
					self._udm_obj = None
714
					self._udm_obj = None
715
				else:
715
				else:
716
					self._udm_obj.open()
716
					self._udm_obj.open(False)
717
			self._udm_obj_searched = True
717
			self._udm_obj_searched = True
718
		return self._udm_obj
718
		return self._udm_obj
719
719
 Lines 781-787   class UCSSchoolHelperAbstractClass(object): Link Here 
781
		logger.debug('Getting all %s of %s with filter %r', cls.__name__, school, complete_filter)
781
		logger.debug('Getting all %s of %s with filter %r', cls.__name__, school, complete_filter)
782
		ret = []
782
		ret = []
783
		for udm_obj in cls.lookup(lo, school, complete_filter, superordinate=superordinate):
783
		for udm_obj in cls.lookup(lo, school, complete_filter, superordinate=superordinate):
784
			udm_obj.open()
784
			udm_obj.open(False)
785
			try:
785
			try:
786
				ret.append(cls.from_udm_obj(udm_obj, school, lo))
786
				ret.append(cls.from_udm_obj(udm_obj, school, lo))
787
			except NoObject:
787
			except NoObject:
 Lines 835-841   class UCSSchoolHelperAbstractClass(object): Link Here 
835
				# while Group must be converted into ComputerRoom, etc. and User must be converted into Student, etc.
835
				# while Group must be converted into ComputerRoom, etc. and User must be converted into Student, etc.
836
				raise WrongModel(udm_obj.dn, klass, cls)
836
				raise WrongModel(udm_obj.dn, klass, cls)
837
			return klass.from_udm_obj(udm_obj, school, lo)
837
			return klass.from_udm_obj(udm_obj, school, lo)
838
		udm_obj.open()
838
		udm_obj.open(False)
839
		attrs = {'school': cls.get_school_from_dn(udm_obj.dn) or school}  # TODO: is this adjustment okay?
839
		attrs = {'school': cls.get_school_from_dn(udm_obj.dn) or school}  # TODO: is this adjustment okay?
840
		if cls.supports_schools():
840
		if cls.supports_schools():
841
			attrs['schools'] = udm_obj['school']
841
			attrs['schools'] = udm_obj['school']
 Lines 919-925   class UCSSchoolHelperAbstractClass(object): Link Here 
919
		if len(objs) > 1:
919
		if len(objs) > 1:
920
			raise MultipleObjectsError(objs)
920
			raise MultipleObjectsError(objs)
921
		obj = objs[0]
921
		obj = objs[0]
922
		obj.open()
922
		obj.open(False)
923
		return obj
923
		return obj
924
924
925
	@classmethod
925
	@classmethod

Return to bug 47885