diff options
author | Martin Kosek <mkosek@redhat.com> | 2011-07-27 11:24:04 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2011-07-27 18:05:26 +0200 |
commit | e7118a5f28600f8d53999bbfd3cbb46da90956b5 (patch) | |
tree | 105dca2600a05abc9ca9ab23c3f056e249782aa5 | |
parent | 61ff6ff107ad22be6aea3beb78bfc07efc81adb7 (diff) | |
download | freeipa-e7118a5f28600f8d53999bbfd3cbb46da90956b5.tar.gz freeipa-e7118a5f28600f8d53999bbfd3cbb46da90956b5.tar.xz freeipa-e7118a5f28600f8d53999bbfd3cbb46da90956b5.zip |
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
-rw-r--r-- | ipalib/plugins/automount.py | 16 |
1 files changed, 12 insertions, 4 deletions
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) |