Dodanie toolbara dla galerii

[redakcja.git] / apps / api / handlers / manage_handlers.py

diff --git a/apps/api/handlers/manage_handlers.py b/apps/api/handlers/manage_handlers.py
index b94ca72..f2d41b1 100644 (file)
--- a/apps/api/handlers/manage_handlers.py
+++ b/apps/api/handlers/manage_handlers.py
@@ -60,7 +60,7 @@ class PullRequestHandler(BaseHandler):
                 'message': "This pull request is alredy resolved. Can't accept."
             })
             
                 'message': "This pull request is alredy resolved. Can't accept."
             })
             

-        src_doc = lib.document_for_rev( prq.source_revision )
+        src_doc = lib.document_for_revision( prq.source_revision )

 
         lock = lib.lock()
         try:
 
         lock = lib.lock()
         try:


@@ -110,7 +110,7 @@ class PullRequestHandler(BaseHandler):
             # sync state with repository
             prq.status = 'A'
             prq.merged_revision = str(src_doc.shared().revision)
             # sync state with repository
             prq.status = 'A'
             prq.merged_revision = str(src_doc.shared().revision)

-            prq.merged_timestamp = datetime.now()
+            prq.merged_timestamp = datetime.datetime.now()

             prq.save()
 
             return SuccessAllOk().django_response({
             prq.save()
 
             return SuccessAllOk().django_response({