mirrors/univention-corporate-server
2
0
Fork 0
mirror of https://github.com/univention/univention-corporate-server.git synced 2025-10-26 11:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! feat(udm): add trash bin for deleted objects

Browse Source
This commit is contained in:
Florian Best 2025-10-25 12:57:39 +02:00
parent 116f5bbc82
commit 8cd886f2df
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
management/univention-directory-manager-modules/modules/univention/admin/handlers/recyclebin/deletedobject.py
View File

@ -17,7 +17,7 @@ from univention.admin.handlers import simpleLdap
from univention.admin.layout import Group, Tab
from univention.admin.log import log
from univention.admin.modules import _ldap_operational_attribute_names
from univention.admin.recyclebin import IGNORE_ATTRS, RECYCLEBIN_BASE, Reference, create_references, resolve_reference
from univention.admin.recyclebin import IGNORE_ATTRS, RECYCLEBIN_BASE, Reference, create_references
translation = univention.admin.localization.translation('univention.admin.handlers.recyclebin')
@ -201,7 +201,7 @@ class object(simpleLdap):
memberof_references = [ref for ref in references if ref.target_module == 'groups/group' and ref.target_property in ('users', 'hosts', 'nestedGroup') and ref.source_attr == 'dn']
if memberof_references:
member_of = [
resolve_reference(ref, self.lo)
ref.resolve(self.lo)
for ref in memberof_references
]
oldattr['memberOf'] = [x.encode('UTF-8') for x in member_of if x]

2
management/univention-directory-manager-modules/modules/univention/admin/recyclebin.py
View File

@ -116,7 +116,7 @@ def create_references(lo, object_type: str, oldattr: dict[str, list[bytes]]):
if member_of := oldattr.get('memberOf'):
groups = [x.decode('UTF-8') for x in member_of]
refs.extend(
Reference('dn', 'groups/group', {'groups/group': 'nestedGroup', 'users/user': 'user'}.get(object_type, 'host'), to_uuid(dn, lo))
Reference('dn', 'groups/group', {'groups/group': 'nestedGroup', 'users/user': 'user'}.get(object_type), to_uuid(dn, lo))
for dn in groups
)
return refs