X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bc6587a11ccc72c7f4bf525f9b37fedc15f8bfa5..351e2a633425b85d99a284b8836f375f81cc8dce:/apps/api/handlers/manage_handlers.py?ds=sidebyside diff --git a/apps/api/handlers/manage_handlers.py b/apps/api/handlers/manage_handlers.py index b94ca729..f2d41b1b 100644 --- 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." }) - src_doc = lib.document_for_rev( prq.source_revision ) + src_doc = lib.document_for_revision( prq.source_revision ) 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) - prq.merged_timestamp = datetime.now() + prq.merged_timestamp = datetime.datetime.now() prq.save() return SuccessAllOk().django_response({