Attachment 1728 Details for Bug 14861

[patch] Patch für modedit.py für beschleunigte Policy-Suche

modedit.py.patch (text/plain), 1.82 KB, created by Sönke Schwardt-Krummrich on 2009-06-24 13:55 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Sönke Schwardt-Krummrich

Created: 2009-06-24 13:55 CEST

Size: 1.82 KB

patch

obsolete

>diff --git a/ucs/management/univention-directory-manager/uniconf/modedit.py b/ucs/management/univention-directory-manager/uniconf/modedit.py
>index 2cc2b59..5964544 100644
>--- a/ucs/management/univention-directory-manager/uniconf/modedit.py
>+++ b/ucs/management/univention-directory-manager/uniconf/modedit.py
>@@ -579,7 +579,7 @@ class modedit(unimodule.unimodule):
> 				self.save.put('edit_object', self.object)
> 
> 				# policy select box
>-				pathlist=[]
>+				policydnlist=[]
> 
> 				# receive path info from 'cn=directory,cn=univention,<current domain>' object
> 				pathResult = self.lo.get('cn=directory,cn=univention,'+self.position.getDomain())
>@@ -589,24 +589,13 @@ class modedit(unimodule.unimodule):
> 				if pathResult.has_key(infoattr) and pathResult[infoattr]:
> 					for i in pathResult[infoattr]:
> 						try:
>-							self.lo.searchDn(base=i, scope='base')
>-							pathlist.append(i)
>+							for policydn, policyattr in self.lo.search(base=i, scope="domain"):
>+								if univention.admin.modules.recognize(current_module, policydn, policyattr):
>+									if not policydn in policydnlist: # if containers and their subcontainers are in i we get results twice
>+										policydnlist.append(policydn)
> 						except:
> 							pass
> 
>-				policydnlist=[]
>-				for i in pathlist:
>-					try:
>-						policydns=self.lo.searchDn(base=i, scope="domain")
>-						for policydn in policydns:
>-							if univention.admin.modules.recognize(current_module, policydn, self.lo.get(policydn)):
>-								if not policydn in policydnlist: # if containers and their subcontainers are in pathlist we get results twice
>-									policydnlist.append(policydn)
>-							else:
>-								pass
>-					except:
>-						pass
>-
> 				displaypolicydnlist=[]
> 				if policydnlist:
> 					univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, "modedit policydnlist %s" % (policydnlist))

Actions: View | Diff

Attachments on bug 14861: 1728