From 9737a041253e8bb982246b5097a5d456a5d464a2 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Fri, 4 Jan 2019 10:34:34 +0000 Subject: [PATCH] Merge pull request #1338 from sharelatex/as-remove-import-modal Don't show project import modal if feature flag is set GitOrigin-RevId: f48d5e5cc795030d6c3332f5fde744d2e67f6366 --- .../web/app/views/project/list/v1-item.pug | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/services/web/app/views/project/list/v1-item.pug b/services/web/app/views/project/list/v1-item.pug index 66c609ef2e..caccdfb2ac 100644 --- a/services/web/app/views/project/list/v1-item.pug +++ b/services/web/app/views/project/list/v1-item.pug @@ -7,16 +7,19 @@ ) span if settings.overleaf && settings.overleaf.host - button.btn.btn-link.projectName( - ng-click="openV1ImportModal(project)" - stop-propagation="click" - ng-show="project.accessLevel == 'owner'" - ) {{project.name}} - a.projectName( - href='/sign_in_to_v1?return_to=/{{project.id}}' - target="_blank" - ng-hide="project.accessLevel == 'owner'" - ) {{project.name}} + if hasFeature('force-import-to-v2') + a.projectName(href='/{{project.id}}') {{project.name}} + else + button.btn.btn-link.projectName( + ng-click="openV1ImportModal(project)" + stop-propagation="click" + ng-show="project.accessLevel == 'owner'" + ) {{project.name}} + a.projectName( + href='/sign_in_to_v1?return_to=/{{project.id}}' + target="_blank" + ng-hide="project.accessLevel == 'owner'" + ) {{project.name}} .col-xs-2 span.owner {{ownerName()}}