From ddb58a9dd79558764c992a4a965c2cca404b615a Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Mon, 17 Aug 2015 09:39:48 +0200
Subject: [PATCH] vault: Fix param labels in output of vault owner commands

https://fedorahosted.org/freeipa/ticket/5214

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
---
 ipalib/plugins/vault.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ipalib/plugins/vault.py b/ipalib/plugins/vault.py
index 01c6096335d47b337253d4f2d1e0571200383c7a..b5a12d5c3da599d7f5afaed90f579ad3a23c27cd 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 = (
-- 
2.4.3