From e7118a5f28600f8d53999bbfd3cbb46da90956b5 Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Wed, 27 Jul 2011 11:24:04 +0200 Subject: Fix automountkey commands summary The summary value was set to primary key. However, the primary key may contain also an info option as a workaround for multiple direct maps problem. This patch sets the result 'value' and thus summary text to expected and consistent value. https://fedorahosted.org/freeipa/ticket/1524 --- ipalib/plugins/automount.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'ipalib') diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py index d692b2c86..1879c56c0 100644 --- a/ipalib/plugins/automount.py +++ b/ipalib/plugins/automount.py @@ -761,7 +761,9 @@ class automountkey_add(LDAPCreate): else: options[self.obj.primary_key.name] = self.obj.get_pk(key, None) options['add_operation'] = True - return super(automountkey_add, self).execute(*keys, **options) + result = super(automountkey_add, self).execute(*keys, **options) + result['value'] = options['automountkey'] + return result api.register(automountkey_add) @@ -828,7 +830,9 @@ class automountkey_del(LDAPDelete): options[self.obj.primary_key.name] = self.obj.get_pk( options['automountkey'], options.get('automountinformation', None)) - return super(automountkey_del, self).execute(*keys, **options) + result = super(automountkey_del, self).execute(*keys, **options) + result['value'] = options['automountkey'] + return result api.register(automountkey_del) @@ -864,7 +868,9 @@ class automountkey_mod(LDAPUpdate): options[self.obj.primary_key.name] = self.obj.get_pk( options['automountkey'], options.get('automountinformation', None)) - return super(automountkey_mod, self).execute(*keys, **options) + result = super(automountkey_mod, self).execute(*keys, **options) + result['value'] = options['automountkey'] + return result api.register(automountkey_mod) @@ -909,6 +915,8 @@ class automountkey_show(LDAPRetrieve): options['automountkey'], options.get('automountinformation', None)) - return super(automountkey_show, self).execute(*keys, **options) + result = super(automountkey_show, self).execute(*keys, **options) + result['value'] = options['automountkey'] + return result api.register(automountkey_show) -- cgit