Attachment 7548 Details for Bug 35925 – patch

[patch] patch

35925.patch (text/plain), 1.49 KB, created by Florian Best on 2016-03-22 07:38:21 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-03-22 07:38:21 CET

Size: 1.49 KB

patch

obsolete

>diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printermodel.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printermodel.py
>index 1028332..c196ef6 100644
>--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printermodel.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printermodel.py
>@@ -71,7 +71,7 @@
> 			multivalue=1,
> 			include_in_default_search=1,
> 			options=[],
>-			dontsearch=1,
>+			dontsearch=0,
> 			required=0,
> 			may_change=1,
> 			identifies=0,
>@@ -119,6 +119,12 @@ def _ldap_pre_create(self):
> 	def _ldap_addlist(self):
> 		return [ ('objectClass', ['top', 'univentionPrinterModels']) ]
> 
>+def rewrite(filter, mapping):
>+	if filter.variable == 'printmodel':
>+		filter.variable = 'printerModel'
>+	else:
>+		univention.admin.mapping.mapRewrite(filter, mapping)
>+
> def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
> 
> 	filter=univention.admin.filter.conjunction('&', [
>@@ -127,7 +133,7 @@ def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0,
> 
> 	if filter_s:
> 		filter_p=univention.admin.filter.parse(filter_s)
>-		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
>+		univention.admin.filter.walk(filter_p, rewrite, arg=mapping)
> 		filter.expressions.append(filter_p)
> 
> 	res=[]

Actions: View | Diff

Attachments on bug 35925: 7548