X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f1b70c0cd342b6769df2326ffc122add67ccd917..c51a084ecf2fefb54ef9f74b21beff437ac9a4bb:/apps/api/handlers/library_handlers.py

diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py
index 0385c0f4..39177f53 100644
--- 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)
-
-        # sort the right way
         
-
         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()
 
-        new_udoc = udoc.latest()
+        nudoc = udoc.latest()
 
         return response.SuccessAllOk().django_response({
-            "name": udoc.id,
+            "name": nudoc.id,
             "parent_user_resivion": udoc.revision,
             "parent_revision": doc.revision,
-            "revision": ndoc.revision,
-            'timestamp': ndoc.revision.timestamp,
+            "revision": nudoc.revision,
+            'timestamp': nudoc.revision.timestamp,
         })