X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/020ad779bc86249cd11cb8aa4970420b16789f55..dbd31e1486a3f2a94cb6828ee5ceb7dee783091f:/apps/api/handlers/library_handlers.py diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py index 2b1edb21..f7d57849 100644 --- 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() + else: + user_doc_new = user_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() + else: + doc_new = doc # the user wersion is the same user_doc_new = base_doc