projects
/
pithos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New public objects implementation.
[pithos]
/
pithos
/
public
/
functions.py
diff --git
a/pithos/public/functions.py
b/pithos/public/functions.py
index
ecbc3b8
..
6eb2c04
100644
(file)
--- a/
pithos/public/functions.py
+++ b/
pithos/public/functions.py
@@
-65,12
+65,11
@@
def object_meta(request, v_account, v_container, v_object):
try:
meta = backend.get_object_meta(request.user, v_account, v_container, v_object)
try:
meta = backend.get_object_meta(request.user, v_account, v_container, v_object)
- permissions = backend.get_object_permissions(request.user, v_account, v_container, v_object)
+ public = backend.get_object_public(request.user, v_account, v_container, v_object)
except:
raise ItemNotFound('Object does not exist')
except:
raise ItemNotFound('Object does not exist')
- # TODO: Fix public indicator.
- if 'public' not in permissions:
+ if not public:
raise ItemNotFound('Object does not exist')
update_manifest_meta(request, v_account, meta)
raise ItemNotFound('Object does not exist')
update_manifest_meta(request, v_account, meta)
@@
-91,12
+90,11
@@
def object_read(request, v_account, v_container, v_object):
try:
meta = backend.get_object_meta(request.user, v_account, v_container, v_object)
try:
meta = backend.get_object_meta(request.user, v_account, v_container, v_object)
- permissions = backend.get_object_permissions(request.user, v_account, v_container, v_object)
+ public = backend.get_object_public(request.user, v_account, v_container, v_object)
except:
raise ItemNotFound('Object does not exist')
except:
raise ItemNotFound('Object does not exist')
- # TODO: Fix public indicator.
- if 'public' not in permissions:
+ if not public:
raise ItemNotFound('Object does not exist')
update_manifest_meta(request, v_account, meta)
raise ItemNotFound('Object does not exist')
update_manifest_meta(request, v_account, meta)