diff options
Diffstat (limited to 'ipalib/plugins')
-rw-r--r-- | ipalib/plugins/baseldap.py | 2 | ||||
-rw-r--r-- | ipalib/plugins/hbacsvc.py | 4 | ||||
-rw-r--r-- | ipalib/plugins/hbacsvcgroup.py | 4 | ||||
-rw-r--r-- | ipalib/plugins/hostgroup.py | 4 | ||||
-rw-r--r-- | ipalib/plugins/selfservice.py | 4 | ||||
-rw-r--r-- | ipalib/plugins/sudocmd.py | 4 | ||||
-rw-r--r-- | ipalib/plugins/sudocmdgroup.py | 4 | ||||
-rw-r--r-- | ipalib/plugins/sudorule.py | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 2e999131..3465c374 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -348,7 +348,7 @@ class LDAPObject(Object): for ldap_obj_name in self.attribute_members[attr]: ldap_obj = self.api.Object[ldap_obj_name] if member.find(ldap_obj.container_dn) > 0: - new_attr = '%s_%s' % (attr, ldap_obj.object_name) + new_attr = '%s_%s' % (attr, ldap_obj.name) entry_attrs.setdefault(new_attr, []).append( ldap_obj.get_primary_key_from_dn(member) ) diff --git a/ipalib/plugins/hbacsvc.py b/ipalib/plugins/hbacsvc.py index df877a60..c2f2532e 100644 --- a/ipalib/plugins/hbacsvc.py +++ b/ipalib/plugins/hbacsvc.py @@ -52,8 +52,8 @@ class hbacsvc(LDAPObject): HBAC Service object. """ container_dn = api.env.container_hbacservice - object_name = 'hbacsvc' - object_name_plural = 'hbacsvcs' + object_name = 'HBAC service' + object_name_plural = 'HBAC services' object_class = [ 'ipaobject', 'ipahbacservice' ] default_attributes = ['cn', 'description', 'memberindirect',] uuid_attribute = 'ipauniqueid' diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py index 4823a8b3..356bae43 100644 --- a/ipalib/plugins/hbacsvcgroup.py +++ b/ipalib/plugins/hbacsvcgroup.py @@ -52,8 +52,8 @@ class hbacsvcgroup(LDAPObject): HBAC service group object. """ container_dn = api.env.container_hbacservicegroup - object_name = 'hbacsvcgroup' - object_name_plural = 'hbacsvcgroups' + object_name = 'HBAC service group' + object_name_plural = 'HBAC service groups' object_class = ['ipaobject', 'ipahbacservicegroup'] default_attributes = [ 'cn', 'description', 'member' ] uuid_attribute = 'ipauniqueid' diff --git a/ipalib/plugins/hostgroup.py b/ipalib/plugins/hostgroup.py index c5b96056..6683c49c 100644 --- a/ipalib/plugins/hostgroup.py +++ b/ipalib/plugins/hostgroup.py @@ -56,8 +56,8 @@ class hostgroup(LDAPObject): Hostgroup object. """ container_dn = api.env.container_hostgroup - object_name = 'hostgroup' - object_name_plural = 'hostgroups' + object_name = 'host group' + object_name_plural = 'host groups' object_class = ['ipaobject', 'ipahostgroup'] default_attributes = ['cn', 'description', 'member', 'memberof', 'memberindirect', 'memberofindirect', diff --git a/ipalib/plugins/selfservice.py b/ipalib/plugins/selfservice.py index 8154d2da..55aa7c1d 100644 --- a/ipalib/plugins/selfservice.py +++ b/ipalib/plugins/selfservice.py @@ -70,8 +70,8 @@ class selfservice(Object): """ bindable = False - object_name = 'selfservice', - object_name_plural = 'selfservice', + object_name = 'self service permission', + object_name_plural = 'self service permissions', label = _('Self Service Permissions') label_singular = _('self service permission') diff --git a/ipalib/plugins/sudocmd.py b/ipalib/plugins/sudocmd.py index a3f3beb0..800ab240 100644 --- a/ipalib/plugins/sudocmd.py +++ b/ipalib/plugins/sudocmd.py @@ -47,8 +47,8 @@ class sudocmd(LDAPObject): Sudo Command object. """ container_dn = api.env.container_sudocmd - object_name = 'sudocmd' - object_name_plural = 'sudocmds' + object_name = 'sudo command' + object_name_plural = 'sudo commands' object_class = ['ipaobject', 'ipasudocmd'] # object_class_config = 'ipahostobjectclasses' search_attributes = [ diff --git a/ipalib/plugins/sudocmdgroup.py b/ipalib/plugins/sudocmdgroup.py index 49b172ea..bee417a9 100644 --- a/ipalib/plugins/sudocmdgroup.py +++ b/ipalib/plugins/sudocmdgroup.py @@ -51,8 +51,8 @@ class sudocmdgroup(LDAPObject): Sudo Group object. """ container_dn = api.env.container_sudocmdgroup - object_name = 'sudocmdgroup' - object_name_plural = 'sudocmdgroups' + object_name = 'sudo command group' + object_name_plural = 'sudo command groups' object_class = ['ipaobject', 'ipasudocmdgrp'] default_attributes = [ 'cn', 'description', 'member', diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py index a85e943f..f595727d 100644 --- a/ipalib/plugins/sudorule.py +++ b/ipalib/plugins/sudorule.py @@ -45,8 +45,8 @@ class sudorule(LDAPObject): Sudo Rule management """ container_dn = api.env.container_sudorule - object_name = 'Sudo Rule' - object_name_plural = 'Sudo Rules' + object_name = 'sudo rule' + object_name_plural = 'sudo rules' object_class = ['ipaassociation', 'ipasudorule'] default_attributes = [ 'cn', 'ipaenabledflag', |