Revision b18ef3ad pithos/api/functions.py
b/pithos/api/functions.py | ||
---|---|---|
198 | 198 |
meta, groups = get_account_headers(request) |
199 | 199 |
replace = True |
200 | 200 |
if 'update' in request.GET: |
201 |
replace = False
|
|
201 |
replace = False |
|
202 | 202 |
if groups: |
203 | 203 |
try: |
204 | 204 |
backend.update_account_groups(request.user, v_account, groups, replace) |
... | ... | |
237 | 237 |
if not limit: |
238 | 238 |
limit = 10000 |
239 | 239 |
|
240 |
shared = False |
|
241 |
if 'shared' in request.GET: |
|
242 |
shared = True |
|
243 |
|
|
240 | 244 |
try: |
241 |
containers = backend.list_containers(request.user, v_account, marker, limit, until) |
|
245 |
containers = backend.list_containers(request.user, v_account, marker, limit, shared, until)
|
|
242 | 246 |
except NotAllowedError: |
243 | 247 |
raise Unauthorized('Access denied') |
244 | 248 |
except NameError: |
... | ... | |
426 | 430 |
else: |
427 | 431 |
keys = [] |
428 | 432 |
|
433 |
shared = False |
|
434 |
if 'shared' in request.GET: |
|
435 |
shared = True |
|
436 |
|
|
429 | 437 |
try: |
430 |
objects = backend.list_objects(request.user, v_account, v_container, prefix, delimiter, marker, limit, virtual, keys, until) |
|
438 |
objects = backend.list_objects(request.user, v_account, v_container, prefix, delimiter, marker, limit, virtual, keys, shared, until)
|
|
431 | 439 |
except NotAllowedError: |
432 | 440 |
raise Unauthorized('Access denied') |
433 | 441 |
except NameError: |
... | ... | |
901 | 909 |
content_length = -1 |
902 | 910 |
if request.META.get('HTTP_TRANSFER_ENCODING') != 'chunked': |
903 | 911 |
content_length = get_content_length(request) |
904 |
|
|
912 |
|
|
905 | 913 |
if length is None: |
906 | 914 |
length = content_length |
907 | 915 |
else: |
Also available in: Unified diff