From 3117e7b79cfcb4654a79d7fb79aaa852f53617a1 Mon Sep 17 00:00:00 2001 From: Gabe Date: Wed, 11 Feb 2015 09:21:59 -0700 Subject: [PATCH] permission-add does not prompt for ipapermright in interactive mode - Add flag "ask_create" to ipalib/plugins/permission.py - Bump API version https://fedorahosted.org/freeipa/ticket/4872 Reviewed-By: Martin Basti --- API.txt | 2 +- VERSION | 4 ++-- ipalib/plugins/permission.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/API.txt b/API.txt index a6a95783c..2a4719142 100644 --- a/API.txt +++ b/API.txt @@ -2787,7 +2787,7 @@ option: Str('extratargetfilter', attribute=False, cli_name='filter', multivalue= option: Str('filter', attribute=False, cli_name='filter', multivalue=True, required=False) option: StrEnum('ipapermbindruletype', attribute=True, autofill=True, cli_name='bindtype', default=u'permission', multivalue=False, required=True, values=(u'permission', u'all', u'anonymous')) option: DNOrURL('ipapermlocation', alwaysask=True, attribute=True, autofill=False, cli_name='subtree', multivalue=False, query=False, required=False) -option: StrEnum('ipapermright', attribute=True, cli_name='right', deprecated_cli_aliases=set(['permissions']), multivalue=True, required=False, values=(u'read', u'search', u'compare', u'write', u'add', u'delete', u'all')) +option: StrEnum('ipapermright', alwaysask=True, attribute=True, autofill=False, cli_name='right', deprecated_cli_aliases=set(['permissions']), multivalue=True, query=False, required=False, values=(u'read', u'search', u'compare', u'write', u'add', u'delete', u'all')) option: DNParam('ipapermtarget', attribute=True, cli_name='target', multivalue=False, required=False) option: Str('ipapermtargetfilter', attribute=True, cli_name='rawfilter', multivalue=True, required=False) option: Str('memberof', alwaysask=True, attribute=False, autofill=False, cli_name='memberof', multivalue=True, query=False, required=False) diff --git a/VERSION b/VERSION index 122594726..50ce95753 100644 --- a/VERSION +++ b/VERSION @@ -90,5 +90,5 @@ IPA_DATA_VERSION=20100614120000 # # ######################################################## IPA_API_VERSION_MAJOR=2 -IPA_API_VERSION_MINOR=113 -# Last change: npmccallum - expose disabled user auth type +IPA_API_VERSION_MINOR=114 +# Last change: Gabe - Add flag "ask_create" to ipapermright diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py index 43481b9eb..3895d8eae 100644 --- a/ipalib/plugins/permission.py +++ b/ipalib/plugins/permission.py @@ -236,6 +236,7 @@ class permission(baseldap.LDAPObject): '(read, search, compare, write, add, delete, all)'), values=(u'read', u'search', u'compare', u'write', u'add', u'delete', u'all'), + flags={'ask_create'}, ), Str('attrs*', label=_('Effective attributes'),