Attachment 7425 Details for Bug 40487 – patch

[patch] patch

40487.patch (text/plain), 2.88 KB, created by Florian Best on 2016-01-22 13:03:49 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-01-22 13:03:49 CET

Size: 2.88 KB

patch

obsolete

>diff --git a/management/univention-directory-manager-modules/modules/univention/admin/modules.py b/management/univention-directory-manager-modules/modules/univention/admin/modules.py
>index 0465e6c..26fe73d 100644
>--- a/management/univention-directory-manager-modules/modules/univention/admin/modules.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admin/modules.py
>@@ -331,10 +331,6 @@ def name( self ):
> 		return self.get( 'name', '' )
> 
> 	@property
>-	def fillWidth( self ):
>-		return self.get( 'fillWidth', False )
>-
>-	@property
> 	def overwrite( self ):
> 		return self.get( 'overwrite', None )
> 
>@@ -452,7 +448,7 @@ def update_extended_attributes(lo, module, position):
> 		longdesc = attrs.get('univentionUDMPropertyTranslationLongDescription;entry-%s' % lang, attrs.get('univentionUDMPropertyLongDescription', ['']))[0]
> 
> 		# create property
>-		# FIXME: must add attribute to honor fullWidth (should be defined by the syntax)
>+		fullWidth = (attrs.get('univentionUDMPropertyLayoutFullWidth',[ '0' ])[0].upper() in [ '1', 'TRUE' ])
> 		module.property_descriptions[pname] = univention.admin.property(
> 			short_description = shortdesc,
> 			long_description = longdesc,
>@@ -464,7 +460,8 @@ def update_extended_attributes(lo, module, position):
> 			dontsearch = doNotSearch,
> 			identifies = 0,
> 			default = propertyDefault,
>-			editable = editable
>+			editable = editable,
>+			size = 'Two' if fullWidth else None,
> 		)
> 
> 		# add LDAP mapping
>@@ -483,7 +480,6 @@ def update_extended_attributes(lo, module, position):
> 			overwriteProp = attrs.get( 'univentionUDMPropertyLayoutOverwritePosition', [ '' ] )[ 0 ]
> 			if overwriteProp == '0':
> 				overwriteProp = None
>-			fullWidth = ( attrs.get('univentionUDMPropertyLayoutFullWidth',[ '0' ])[0].upper() in [ '1', 'TRUE' ] )
> 			deleteObjectClass = ( attrs.get('univentionUDMPropertyDeleteObjectClass', ['0'])[0].upper() in [ '1', 'TRUE' ] )
> 			tabAdvanced = ( attrs.get('univentionUDMPropertyLayoutTabAdvanced',[ '0' ])[0].upper() in [ '1', 'TRUE' ] )
> 
>@@ -528,7 +524,7 @@ def update_extended_attributes(lo, module, position):
> 						except:
> 							ud.debug(ud.ADMIN, ud.WARN, 'modules update_extended_attributes: custom field for tab %s: failed to set tabPosition' % tabname)
> 
>-				properties4tabs[ tabname ].append( EA_Layout( name = pname, tabName = tabname, position = tabPosition, advanced = tabAdvanced, overwrite = overwriteProp, fullWidth = fullWidth, groupName = groupname, groupPosition = groupPosition ) )
>+				properties4tabs[ tabname ].append( EA_Layout( name = pname, tabName = tabname, position = tabPosition, advanced = tabAdvanced, overwrite = overwriteProp, groupName = groupname, groupPosition = groupPosition ) )
> 
> 			module.extended_udm_attributes.extend( [ univention.admin.extended_attribute( pname, attrs.get('univentionUDMPropertyObjectClass', [])[0],
> 																				  attrs['univentionUDMPropertyLdapMapping'][0], deleteObjectClass,

Actions: View | Diff

Attachments on bug 40487: 7425