Attachment #5223 for bug #30991





	if issubclass( syn.__class__, udm_syntax.UDM_Objects ):
		syn.choices = []
		def extract_key_label(syn, dn, info):
			key = label = None
			if syn.key == 'dn':
				key = dn
			else:
				try:
					key = syn.key % info
				except KeyError:
					pass
			if syn.label == 'dn':
				label = dn
			elif syn.label is None:
				pass
			else:
				try:
					label = syn.label % info
				except KeyError:
					pass
			return key, label
		def map_choices( obj_list ):
			result = []
			for obj in obj_list:
				key, label = extract_key_label(syn, obj.dn, obj.info)
				if key is None or label is None:
					obj.open()
					key, label = extract_key_label(syn, obj.dn, obj.info)
					if key is None:
					try:
						key = syn.key % obj.info
					except KeyError:
						# ignore the entry as the key is important for a selection, there
						# is no sensible fallback for the key (Bug #26994)
						continue
					if label is None:
					label = udm_objects.description( obj )
				elif syn.label == 'dn':
					label = obj.dn
				else:
					try:
						label = syn.label % obj.info
					except KeyError:
						# fallback to the default description as this is just what displayed
						# to the user (Bug #26994)
						label = udm_objects.description( obj )

				result.append( (key, label) )
			return result


(-)modules/univention/admin/handlers/shares/share.py (-1 / +4 lines)

827

			if 'univentionShareNFS' in self.oldattr['objectClass']:

827

			if 'univentionShareNFS' in self.oldattr['objectClass']:

828

				self.options.append( 'nfs' )

828

				self.options.append( 'nfs' )

829

			try:

829

			try:

830

				# ATTENTION: syntax nfsShare wants to use

831

				#   %(printablename)s as label but we changed that because

832

				#   of lookup performance reasons. If you change printablename

833

				#   here, you probably want to change the label of the syntax, too.

830

				self['printablename'] = "%s (%s)" % (self['name'], self['host'])

834

				self['printablename'] = "%s (%s)" % (self['name'], self['host'])

831

			except:

835

			except:

832

				pass

836

				pass

900

		if not hasattr(self,"options"):

904

		if not hasattr(self,"options"):

901

			self.open()

905

			self.open()

902

		if 'nfs' in self.options:

906

		if 'nfs' in self.options:

903

			ulist=[]

904

			searchstring="*"+self['host']+":"+self['path']+"*"

907

			searchstring="*"+self['host']+":"+self['path']+"*"

905

			searchResult=self.lo.searchDn(base=self.position.getDomain(), filter='(&(objectClass=person)(automountInformation=%s))'%searchstring, scope='domain')

908

			searchResult=self.lo.searchDn(base=self.position.getDomain(), filter='(&(objectClass=person)(automountInformation=%s))'%searchstring, scope='domain')

906

			if searchResult:

909

			if searchResult:

(-)modules/univention/admin/de.po (+4 lines)

Lines 221-226	Link Here

221

msgid "cannot find fqdn of "

221

msgid "cannot find fqdn of "

222

msgstr "FQDN konnte nicht gefunden werden: "

222

msgstr "FQDN konnte nicht gefunden werden: "

223

224

#: syntax.py:1743

225

msgid "%(name)s (%(path)s on %(host)s)"

226

msgstr "%(name)s (%(path)s auf %(host)s)"

227

224

#: syntax.py:109 syntax.py:162 syntax.py:298

228

#: syntax.py:109 syntax.py:162 syntax.py:298

225

msgid "Invalid value"

229

msgid "Invalid value"

226

msgstr "Ungültiger Wert"

230

msgstr "Ungültiger Wert"





class GroupDN( UDM_Objects ):
	udm_modules = ( 'groups/group', )
	label = '%(name)s' # TODO: may be removed when UDM_Objects is able to extract from DN without initializing object

class UserDN( UDM_Objects ):
	udm_modules = ( 'users/user', )
	label = '%(username)s' # TODO: may be removed when UDM_Objects is able to extract from DN without initializing object

class HostDN( UDM_Objects ):
	udm_modules = ( 'computers/computer', )

class DNS_ForwardZone( UDM_Objects ):
 	description=_('DNS forward zone')
	udm_modules = ( 'dns/forward_zone', )
	label = '%(zone)s'
	empty_value = True
	size = 'TwoThirds'

class DNS_ReverseZone( UDM_Objects ):
 	description=_('DNS reverse zone')
	udm_modules = ( 'dns/reverse_zone', )
	label = '%(subnet)s'
	empty_value = True
	size = 'TwoThirds'


class WritableShare( UDM_Objects ):
	udm_modules = ( 'shares/share', )
	udm_filter = 'writeable=1'
	label = _('%(name)s (%(path)s on %(host)s)') # ldap-optimized for shares/share.description()
	size = 'OneAndAHalf'
	empty_value = True


class nfsShare(UDM_Objects):
	udm_modules = ( 'shares/share', )
	key = 'dn'
	label = '%(name)s (%(host)s)' # ldap-optimized for '%(printablename)s'
	udm_filter = 'objectClass=univentionShareNFS'

class nfsMounts(complex):

Return to bug 30991