Attachment #10935 for bug #43286




		"""Hook which is called after the object removal."""
		self._release_locks()

	def remove_value(self, key, value=None):
		"""Removes a specific value from the specified property.
			If this value is currently not set univention.admin.uexceptions.valueNotSet is raised.
			if value is None the whole values of this property gets removed.
		"""
		if not self.has_property(key):
			raise univention.admin.uexceptions.noProperty(key)

		if value is None:
			# remove all currently set values
			self[key] = [] if self.descriptions[key].multivalue else None
			return

		if not self.contains_value(key, value):
			raise univention.admin.uexceptions.valueNotSet(key, value)

		if not self.descriptions[key].multivalue:
			self[key] = value
			return

		current_values = list(self[key])
		for val in current_values[:]:
			if self.compare_value(key, value, val):
				current_values.remove(val)
		self[key] = current_values

	def contains_value(self, key, value):
		if self.descriptions[key].multivalue and any(self.compare_value(key, value, val) for val in self[key]):
			return True
		if not self.descriptions[key].multivalue and self.compare_value(key, value, self[key]):
			return True
		return False

	def compare_value(self, key, a, b):
		return self.descriptions[key].syntax.normalize(a) == self.descriptions[key].syntax.normalize(b)

	def append_value(self, key, value):
		if not self.has_property(key):
			raise univention.admin.uexceptions.noProperty(key)

		if self.contains_value(key, value):
			raise univention.admin.uexceptions.valueAlreadySet(key, value)

		if not self.descriptions[key].multivalue:
			self[key] = value
			return

		current_values = self[key]
		current_values.append(value)
		self[key] = current_values

	def _safe_cancel(self):  # type: () -> None
		try:
			self.cancel()

(-)management/univention-directory-manager-modules/modules/univention/admin/syntax.py (+14 lines)

Lines 257-262 class ISyntax(object):	Link Here

257

"""

257

"""

258

		return text

258

		return text

259

260

	@classmethod

261

	def normalize(cls, value):

262

		return cls.parse(value)

263

260

	def parse_command_line(self, value):

264

	def parse_command_line(self, value):

261

		return value

265

		return value

262

266

Lines 774-779 class UDM_Objects(ISyntax, _UDMObjectOrAttribute):	Link Here

774

			return univention.admin.types.DistinguishedNameType

778

			return univention.admin.types.DistinguishedNameType

775

		return univention.admin.types.StringType

779

		return univention.admin.types.StringType

776

780

781

	@classmethod

782

	def normalize(cls, value):

783

		if cls.key == 'dn':

784

			return univention.admin.uldap.DN(value)

785

		return super(UDM_Objects, cls).normalize(value)

786

777

	@classmethod

787

	@classmethod

778

	def parse(self, text):

788

	def parse(self, text):

779

		if not self.empty_value and not text:

789

		if not self.empty_value and not text:

Lines 3414-3419 class ldapDn(simple):	Link Here

3414

3424

3415

	type_class = univention.admin.types.DistinguishedNameType

3425

	type_class = univention.admin.types.DistinguishedNameType

3416

3426

3427

	@classmethod

3428

	def normalize(cls, value):

3429

		return univention.admin.uldap.DN(value)

3430

3417

	@classmethod

3431

	@classmethod

3418

	def get_widget(cls, prop):

3432

	def get_widget(cls, prop):

3419

		if cls is ldapDn:

3433

		if cls is ldapDn:

(-)management/univention-directory-manager-modules/modules/univention/admin/uexceptions.py (+8 lines)

Lines 105-110 class valueMismatch(valueError):	Link Here

105

	message = _('Values do not match.')

105

	message = _('Values do not match.')

106

107

108

class valueNotSet(valueError):

109

	message = _('The value is not set.')

110

111

112

class valueAlreadySet(valueError):

113

	message = _('The value is already set.')

114

115

108

class noLock(base):

116

class noLock(base):

109

	message = _('Could not acquire lock.')

117

	message = _('Could not acquire lock.')

110

118




					out.append('WARNING: file not found: %s' % values)
			else:
				values = [module.property_descriptions[key].syntax.parse_command_line(x) for x in values]
				for value in values:
				if current_values == ['']:
					current_values = []

				for val in values:
					if val in current_values:
						out.append('WARNING: cannot append %s to %s, value exists' % (val, key))
					else:
						current_values.append(val)

				if not module.property_descriptions[key].multivalue:
					try:
						object.append_value(key, value)
					except univention.admin.uexceptions.noProperty:
						raise OperationFailed(out, "WARNING: No attribute with name %s in this module, value not appended." % (key,))
					except univention.admin.uexceptions.valueNotSet as exc:
						raise OperationFailed(out, "WARNING: cannot append %s to %s: %s" % (value, key, exc))
					except univention.admin.uexceptions.valueInvalidSyntax as errmsg:
						raise OperationFailed(out, 'E: Invalid Syntax: %s' % (errmsg,))
					raise OperationFailed(out, 'E: Invalid Syntax: %s' % (errmsg,))

	if remove:
		for key, values in remove.items():
			try:
				if values is None:
					object.remove_value(key, values)
					continue
				for value in values:
					value = module.property_descriptions[key].syntax.parse_command_line(value)
					#try:  # TODO: remove?! move into normalize()
					#	value = module.property_descriptions[key].syntax.parse(value)
					#except (univention.admin.uexceptions.valueInvalidSyntax, univention.admin.uexceptions.valueError):
					#	pass
					object.remove_value(key, value)
			except univention.admin.uexceptions.noProperty:
				out.append("WARNING: No attribute with name %s in this module, value not removed." % (key,))
			except univention.admin.uexceptions.valueNotSet as exc:
				out.append("WARNING: cannot remove %s from %s: %s" % (value, key, exc))
					elif normalized_val is not None and normalized_val in current_values:
						current_values.remove(normalized_val)
					else:
						out.append("WARNING: cannot remove %s from %s, value does not exist" % (val, key))
			if not module.property_descriptions[key].multivalue:
				try:
					current_values = current_values[0]
				except IndexError:
					current_values = None
			object[key] = current_values

	if input:
		for key, value in input.items():

Return to bug 43286