fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Poprawione kilka literówek.
[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
0385c0f
..
39177f5
100644
(file)
--- a/
apps/api/handlers/library_handlers.py
+++ b/
apps/api/handlers/library_handlers.py
@@
-85,10
+85,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']))
@@
-520,12
+517,12
@@
class MergeHandler(BaseHandler):
if not changed:
return response.SuccessNoContent().django_response()
if not changed:
return response.SuccessNoContent().django_response()
- n
ew_
udoc = udoc.latest()
+ nudoc = udoc.latest()
return response.SuccessAllOk().django_response({
return response.SuccessAllOk().django_response({
- "name": udoc.id,
+ "name":
n
udoc.id,
"parent_user_resivion": udoc.revision,
"parent_revision": doc.revision,
"parent_user_resivion": udoc.revision,
"parent_revision": doc.revision,
- "revision": ndoc.revision,
- 'timestamp': ndoc.revision.timestamp,
+ "revision": n
u
doc.revision,
+ 'timestamp': n
u
doc.revision.timestamp,
})
})