summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Babej <tbabej@redhat.com>2012-10-30 09:44:50 -0400
committerMartin Kosek <mkosek@redhat.com>2012-12-11 12:34:39 +0100
commit4ec04e53936d78a9377e3009dfb25bceead0b551 (patch)
tree265044fb540e164e6a1f4a39435e5fa326ed4543
parent7340752fc32c7405100ddee7ecf23c72c1d9c086 (diff)
downloadfreeipa.git-4ec04e53936d78a9377e3009dfb25bceead0b551.tar.gz
freeipa.git-4ec04e53936d78a9377e3009dfb25bceead0b551.tar.xz
freeipa.git-4ec04e53936d78a9377e3009dfb25bceead0b551.zip
Relax restriction for leading/trailing whitespaces in *-find commands
All *-find commands now enable leading/trailing whitespaces in the search phrase. Behaviour has been implemented directly into crud.Search class. IPA_API_VERSION_MINOR incremented to 45. https://fedorahosted.org/freeipa/ticket/2981
-rw-r--r--API.txt6
-rw-r--r--VERSION2
-rw-r--r--ipalib/crud.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/API.txt b/API.txt
index e33445c2..ab610626 100644
--- a/API.txt
+++ b/API.txt
@@ -28,7 +28,7 @@ output: Output('result', <type 'bool'>, None)
output: Output('value', <type 'unicode'>, None)
command: aci_find
args: 1,16,4
-arg: Str('criteria?')
+arg: Str('criteria?', noextrawhitespace=False)
option: Str('aciname', attribute=False, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
option: Str('permission', attribute=False, autofill=False, cli_name='permission', multivalue=False, query=True, required=False)
option: Str('group', attribute=False, autofill=False, cli_name='group', multivalue=False, query=True, required=False)
@@ -570,7 +570,7 @@ output: Output('result', <type 'bool'>, None)
output: Output('value', <type 'unicode'>, None)
command: delegation_find
args: 1,9,4
-arg: Str('criteria?')
+arg: Str('criteria?', noextrawhitespace=False)
option: Str('aciname', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
option: Str('permissions', attribute=True, autofill=False, cli_name='permissions', csv=True, multivalue=True, query=True, required=False)
option: Str('attrs', attribute=True, autofill=False, cli_name='attrs', csv=True, multivalue=True, query=True, required=False)
@@ -2574,7 +2574,7 @@ output: Output('result', <type 'bool'>, None)
output: Output('value', <type 'unicode'>, None)
command: selfservice_find
args: 1,7,4
-arg: Str('criteria?')
+arg: Str('criteria?', noextrawhitespace=False)
option: Str('aciname', attribute=True, autofill=False, cli_name='name', multivalue=False, pattern='^[-_ a-zA-Z0-9]+$', primary_key=True, query=True, required=False)
option: Str('permissions', attribute=True, autofill=False, cli_name='permissions', csv=True, multivalue=True, query=True, required=False)
option: Str('attrs', attribute=True, autofill=False, cli_name='attrs', csv=True, multivalue=True, query=True, required=False)
diff --git a/VERSION b/VERSION
index 3936f394..970c09dd 100644
--- a/VERSION
+++ b/VERSION
@@ -79,4 +79,4 @@ IPA_DATA_VERSION=20100614120000
# #
########################################################
IPA_API_VERSION_MAJOR=2
-IPA_API_VERSION_MINOR=46
+IPA_API_VERSION_MINOR=47
diff --git a/ipalib/crud.py b/ipalib/crud.py
index 12edbf58..d54b91fd 100644
--- a/ipalib/crud.py
+++ b/ipalib/crud.py
@@ -230,7 +230,7 @@ class Search(Method):
has_output = output.standard_list_of_entries
def get_args(self):
- yield parameters.Str('criteria?')
+ yield parameters.Str('criteria?', noextrawhitespace=False)
def get_options(self):
if self.extra_options_first: