From c25d62965af9dffc655d659dfcd1f39e8d08e66c Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 4 Oct 2010 17:45:40 -0400 Subject: Populate indirect members when showing a group object. This is done by creating a new attribute, memberindirect, to hold this indirect membership. The new function get_members() can return all members or just indirect or direct. We are only using it to retrieve indirect members currently. This also: * Moves all member display attributes into baseldap.py to reduce duplication * Adds netgroup nesting * Use a unique object name in hbacsvc and hbacsvcgroup ticket 296 --- ipalib/plugins/taskgroup.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'ipalib/plugins/taskgroup.py') diff --git a/ipalib/plugins/taskgroup.py b/ipalib/plugins/taskgroup.py index 11bef486..ba3f5073 100644 --- a/ipalib/plugins/taskgroup.py +++ b/ipalib/plugins/taskgroup.py @@ -33,7 +33,6 @@ from ipalib.plugins.baseldap import * from ipalib import api, _, ngettext - class taskgroup(LDAPObject): """ Taskgroup object. @@ -42,9 +41,12 @@ class taskgroup(LDAPObject): object_name = 'taskgroup' object_name_plural = 'taskgroups' object_class = ['groupofnames'] - default_attributes = ['cn', 'description', 'member', 'memberof'] + default_attributes = ['cn', 'description', 'member', 'memberof', + 'memberindirect' + ] attribute_members = { 'member': ['user', 'group', 'rolegroup'], + 'memberindirect': ['user', 'group', 'rolegroup'], # FIXME: taskgroup can be member of ??? } rdnattr='cn' @@ -63,18 +65,6 @@ class taskgroup(LDAPObject): label=_('Description'), doc=_('Task-group description'), ), - Str('member_group?', - label=_('Member groups'), - flags=['no_create', 'no_update', 'no_search'], - ), - Str('member_user?', - label=_('Member users'), - flags=['no_create', 'no_update', 'no_search'], - ), - Str('member_rolegroup?', - label=_('Member role-groups'), - flags=['no_create', 'no_update', 'no_search'], - ), ) api.register(taskgroup) -- cgit