diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-08-17 09:39:48 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2015-08-18 11:17:29 +0200 |
| commit | f66d7043dc2f35bdc7f7f3774ecbc12046b7feef (patch) | |
| tree | 1fa8a8289051da020fe3c709bbde92b0c2b9348d | |
| parent | 649a1a7c65d5ba99183dd0437d9ab4f20fa05530 (diff) | |
| download | freeipa-f66d7043dc2f35bdc7f7f3774ecbc12046b7feef.tar.gz freeipa-f66d7043dc2f35bdc7f7f3774ecbc12046b7feef.tar.xz freeipa-f66d7043dc2f35bdc7f7f3774ecbc12046b7feef.zip | |
vault: Fix param labels in output of vault owner commands
https://fedorahosted.org/freeipa/ticket/5214
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
| -rw-r--r-- | ipalib/plugins/vault.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ipalib/plugins/vault.py b/ipalib/plugins/vault.py index 01c609633..b5a12d5c3 100644 --- a/ipalib/plugins/vault.py +++ b/ipalib/plugins/vault.py @@ -314,6 +314,11 @@ class vault(LDAPObject): label=_('Owner services'), flags=['no_create', 'no_update', 'no_search'], ), + Str( + 'owner?', + label=_('Failed owners'), + flags=['no_create', 'no_update', 'no_search'], + ), ) def get_dn(self, *keys, **options): @@ -1420,6 +1425,11 @@ class VaultModMember(LDAPModMember): options.pop('service', None) return super(VaultModMember, self).get_member_dns(**options) + def post_callback(self, ldap, completed, failed, dn, entry_attrs, *keys, **options): + for fail in failed.itervalues(): + fail['services'] = fail.pop('service', []) + return completed, dn + @register() class vault_add_owner(VaultModMember, LDAPAddMember): @@ -1428,6 +1438,7 @@ class vault_add_owner(VaultModMember, LDAPAddMember): takes_options = LDAPAddMember.takes_options + vault_options member_attributes = ['owner'] + member_param_label = _('owner %s') member_count_out = ('%i owner added.', '%i owners added.') has_output = ( @@ -1452,6 +1463,7 @@ class vault_remove_owner(VaultModMember, LDAPRemoveMember): takes_options = LDAPRemoveMember.takes_options + vault_options member_attributes = ['owner'] + member_param_label = _('owner %s') member_count_out = ('%i owner removed.', '%i owners removed.') has_output = ( |