fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Galeria skanów z przewijaniem, bez zoom'a.
[redakcja.git]
/
apps
/
api
/
handlers
/
library_handlers.py
diff --git
a/apps/api/handlers/library_handlers.py
b/apps/api/handlers/library_handlers.py
index
f0ce186
..
b9e6314
100644
(file)
--- a/
apps/api/handlers/library_handlers.py
+++ b/
apps/api/handlers/library_handlers.py
@@
-80,10
+80,7
@@
class LibraryHandler(BaseHandler):
# not top-level anymore
document_tree.pop(part)
parent['parts'].append(child)
# not top-level anymore
document_tree.pop(part)
parent['parts'].append(child)
-
- # sort the right way
-
for doc in documents.itervalues():
doc['parts'].sort(key=natural_order(lambda d: d['name']))
for doc in documents.itervalues():
doc['parts'].sort(key=natural_order(lambda d: d['name']))
@@
-507,7
+504,9
@@
class MergeHandler(BaseHandler):
success, changed = udoc.share(form.cleaned_data['message'])
if not success:
success, changed = udoc.share(form.cleaned_data['message'])
if not success:
- return response.EntityConflict().django_response({})
+ return response.EntityConflict().django_response({
+ 'reason': 'merge-failure',
+ })
if not changed:
return response.SuccessNoContent().django_response()
if not changed:
return response.SuccessNoContent().django_response()