Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Kaveh Vahedipour 2016-09-20 11:10:08 +02:00
parent 862355a093 2a5cdf7311
commit f510773498
2 changed files with 386 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

715
js/apps/system/_admin/aardvark/APP/api-docs.json
View File

File diff suppressed because one or more lines are too long

8
utils/generateSwagger.py
View File

@ -1158,13 +1158,13 @@ def unwrapPostJson(reference, layer):
if '$ref' in thisParam: if '$ref' in thisParam:
subStructRef = getReference(thisParam, reference, None) subStructRef = getReference(thisParam, reference, None)
rc += ' ' * layer + " - **" + param + "**:\n" rc += ' ' * layer + "- **" + param + "**:\n"
rc += unwrapPostJson(subStructRef, layer + 1) rc += unwrapPostJson(subStructRef, layer + 1)
elif thisParam['type'] == 'object': elif thisParam['type'] == 'object':
rc += ' ' * layer + " - **" + param + "**: " + TrimThisParam(brTrim(thisParam['description']), layer) + "\n" rc += ' ' * layer + "- **" + param + "**: " + TrimThisParam(brTrim(thisParam['description']), layer) + "\n"
elif swagger['definitions'][reference]['properties'][param]['type'] == 'array': elif swagger['definitions'][reference]['properties'][param]['type'] == 'array':
rc += ' ' * layer + " - **" + param + "**" rc += ' ' * layer + "- **" + param + "**"
trySubStruct = False trySubStruct = False
if 'type' in thisParam['items']: if 'type' in thisParam['items']:
rc += " (" + thisParam['items']['type'] + ")" rc += " (" + thisParam['items']['type'] + ")"
@ -1182,7 +1182,7 @@ def unwrapPostJson(reference, layer):
print >>sys.stderr, thisParam print >>sys.stderr, thisParam
rc += "\n" + unwrapPostJson(subStructRef, layer + 1) rc += "\n" + unwrapPostJson(subStructRef, layer + 1)
else: else:
rc += ' ' * layer + " - **" + param + "**: " + TrimThisParam(thisParam['description'], layer) + '\n' rc += ' ' * layer + "- **" + param + "**: " + TrimThisParam(thisParam['description'], layer) + '\n'
return rc return rc