Uaktualnienie README.rst.

[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 2b1edb2..f7d5784 100644 (file)
--- a/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@ -628,6 +628,8 @@ class MergeHandler(BaseHandler):
             # update user document
             if changed:
                 user_doc_new = user_doc.latest()
             # update user document
             if changed:
                 user_doc_new = user_doc.latest()

+            else:
+                user_doc_new = user_doc

                 
             # shared document is the same
             doc_new = doc
                 
             # shared document is the same
             doc_new = doc


@@ -680,6 +682,8 @@ class MergeHandler(BaseHandler):
             # update shared version if needed
             if changed:
                 doc_new = doc.latest()
             # update shared version if needed
             if changed:
                 doc_new = doc.latest()

+            else:
+                doc_new = doc

 
             # the user wersion is the same
             user_doc_new = base_doc
 
             # the user wersion is the same
             user_doc_new = base_doc