From 07837082f4221e070c40617a5b36807ea80bed46 Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Tue, 2 Aug 2011 17:56:47 +0200 Subject: Hide continue option from automountkey-del This option makes no sense for automount keys. This should be removed in future versions. https://fedorahosted.org/freeipa/ticket/1529 --- API.txt | 2 +- ipalib/plugins/automount.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/API.txt b/API.txt index d78e3529c..48be5911c 100644 --- a/API.txt +++ b/API.txt @@ -117,7 +117,7 @@ command: automountkey_del args: 2,3,3 arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True) arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', label=Gettext('Map', domain='ipa', localedir=None), query=True, required=True) -option: Flag('continue', autofill=True, cli_name='continue', default=False) +option: Flag('continue', autofill=True, cli_name='continue', default=False, exclude='webui', flags=['no_option', 'no_output'], label=FixMe('continue'), multivalue=False, required=True) option: IA5Str('automountkey', cli_name='key', label=Gettext('Key', domain='ipa', localedir=None)) option: IA5Str('automountinformation?', cli_name='info', label=Gettext('Mount information', domain='ipa', localedir=None)) output: Output('summary', (, ), 'User-friendly description of action performed') diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py index d05e0cf1c..e0408033d 100644 --- a/ipalib/plugins/automount.py +++ b/ipalib/plugins/automount.py @@ -824,6 +824,14 @@ class automountkey_del(LDAPDelete): label=_('Mount information'), ), ) + def get_options(self): + for option in self.takes_options: + if option.name == 'continue': + # TODO: hide for now - remove in future major release + yield option.clone(exclude='webui', + flags=['no_option', 'no_output']) + else: + yield option def get_args(self): for key in self.obj.get_ancestor_primary_keys(): -- cgit