summaryrefslogtreecommitdiffstats
path: root/ipalib/plugins/permission.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-03-06 14:37:20 +0100
committerMartin Kosek <mkosek@redhat.com>2014-03-14 10:14:05 +0100
commit254c82727fcbc20c676e986900e48082a91f2100 (patch)
treec1bd0ed999d44727788a6c4a87de50ece051bf84 /ipalib/plugins/permission.py
parentf58ffe176c57d01274888638d637b230c1081a60 (diff)
downloadfreeipa-254c82727fcbc20c676e986900e48082a91f2100.tar.gz
freeipa-254c82727fcbc20c676e986900e48082a91f2100.tar.xz
freeipa-254c82727fcbc20c676e986900e48082a91f2100.zip
permission CLI: Rename filter to rawfilter, extratargetfilter to filter
Since extratargetfilter is shown by default, change it to also have the "default" (i.e. shorter) option name. Reviewed-By: Martin Kosek <mkosek@redhat.com>
Diffstat (limited to 'ipalib/plugins/permission.py')
-rw-r--r--ipalib/plugins/permission.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py
index 7dde36d62..3319028f2 100644
--- a/ipalib/plugins/permission.py
+++ b/ipalib/plugins/permission.py
@@ -231,15 +231,17 @@ class permission(baseldap.LDAPObject):
),
Str(
'extratargetfilter*', prevalidate_filter,
+ cli_name='filter',
label=_('Extra target filter'),
- doc=_('Target filter, excluding filters set by type and memberof'),
+ doc=_('Extra target filter'),
flags={'virtual_attribute'},
),
Str(
'ipapermtargetfilter*', prevalidate_filter,
- cli_name='filter',
- label=_('Target filter'),
- doc=_('Target filter'),
+ cli_name='rawfilter',
+ label=_('Raw target filter'),
+ doc=_('All target filters, including those implied by '
+ 'type and memberof'),
),
DNParam(