Attachment 4923 Details for Bug 28288

[patch] Patch für das Prefix-Handling in der Raumverwaltung

ucs-school-rooms-prefix.patch (text/plain), 1.41 KB, created by Alexander Kläser on 2012-12-17 14:30 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Kläser

Created: 2012-12-17 14:30 CET

Size: 1.41 KB

patch

obsolete

>--- ./schoolrooms/__init__.py.orig	2012-12-17 13:59:13.000000000 +0100
>+++ ./schoolrooms/__init__.py	2012-12-17 14:25:59.000000000 +0100
>@@ -105,10 +105,15 @@
> 		room_obj = group_module.object(None, ldap_user_read, None, request.options[0])
> 		room_obj.open()
> 
>+		# get the school name
>+		schoolDN = room_obj.dn[room_obj.dn.find('ou='):]
>+		school = ldap_user_read.explodeDn(schoolDN, 1)[0]
>+
>+		# prepare the resulting structure
> 		result = {}
> 		result['$dn$'] = room_obj.dn
>-		result[ 'school' ] = room_obj.dn[ room_obj.dn.find( '=' ) + 1 : room_obj.dn.find( '-' ) ]
>-		result['name'] = room_obj['name'].replace( '%s-' % result[ 'school' ], '', 1 )
>+		result['school'] = school
>+		result['name'] = room_obj['name'].replace( '%s-' % school, '', 1 )
> 		result['description'] = room_obj['description']
> 		result['computers'] = room_obj['hosts']
> 
>@@ -158,8 +163,14 @@
> 		if not group_obj:
> 			raise UMC_OptionTypeError('unknown group object')
> 
>+		# apply changes
> 		group_obj.open()
>-		group_obj[ 'name' ] = '%(school)s-%(name)s' % group_props
>+		if group_obj['name'].startswith('%s-' % group_props['school']):
>+			# room had previously a school prefix
>+			group_obj['name'] = '%(school)s-%(name)s' % group_props
>+		else:
>+			# room did not have a school prefix
>+			group_obj['name'] = '%(name)s' % group_props
> 		group_obj['description'] = group_props['description']
> 		group_obj['hosts'] = group_props['computers']
> 		group_obj.modify()

Actions: View | Diff

Attachments on bug 28288: 4918 | 4919 | 4922 | 4923 | 4924 | 4925