From 42cf6a1216d54307d5112f494bb9a72cdafeb425 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Tue, 8 Jan 2019 11:42:23 +0000 Subject: [PATCH] Merge pull request #1362 from sharelatex/as-fix-status-page Fixes for import status page GitOrigin-RevId: 65c18e1c0ea981bf6e5cc8b65045566e14d5fb12 --- .../TokenAccess/TokenAccessController.coffee | 2 +- services/web/app/views/project/v2-import.pug | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/services/web/app/coffee/Features/TokenAccess/TokenAccessController.coffee b/services/web/app/coffee/Features/TokenAccess/TokenAccessController.coffee index 4dc2e55b1c..3ac0af09d9 100644 --- a/services/web/app/coffee/Features/TokenAccess/TokenAccessController.coffee +++ b/services/web/app/coffee/Features/TokenAccess/TokenAccessController.coffee @@ -145,7 +145,7 @@ module.exports = TokenAccessController = return res.render('project/v2-import', { projectId: token, hasOwner: doc_info.has_owner, - name: doc_info.name, + name: doc_info.name || 'Untitled', hasAssignment: doc_info.has_assignment, brandInfo: doc_info.brand_info }) diff --git a/services/web/app/views/project/v2-import.pug b/services/web/app/views/project/v2-import.pug index 8753596707..101a4469fc 100644 --- a/services/web/app/views/project/v2-import.pug +++ b/services/web/app/views/project/v2-import.pug @@ -49,19 +49,8 @@ block content | cannot be automatically imported. Please download a zip file of | the project and upload that to continue editing it. - form( - async-form="v2ZipDownload" - name="v2ZipDownloadForm" - async-form-download-response="true" - method="GET" - action="/overleaf/project/" + projectId + "/download/zip" - ) - form-messages(form="v2ZipDownloadForm") - input.row-spaced.btn.btn-primary.text-center.center-block( - type="submit" - ng-value="v2ZipDownloadForm.inflight || v2ZipDownloadForm.success ? 'Downloading zip file...' : 'Download project zip file'" - ng-disabled="v2ZipDownloadForm.inflight || v2ZipDownloadForm.success" - ) + .row-spaced.text-center + a.btn.btn-primary(href="/overleaf/project/" + projectId + "/download/zip") Download project zip file .row-spaced.text-center if hasAssignment