Bläddra i källkod

Merge pull request #1181 from sharelatex/ja-git-bridge-beta

Open up v2 git bridge to beta users but only with v2 only projects

GitOrigin-RevId: 0895a4636ca9dbffcb112c2b1459773303ecc2cd
James Allen 8 år sedan
förälder
incheckning
38a2b9ee53
1 ändrade filer med 5 tillägg och 2 borttagningar
  1. 5 2
      services/web/app/coffee/Features/Project/ProjectController.coffee

+ 5 - 2
services/web/app/coffee/Features/Project/ProjectController.coffee

@@ -270,7 +270,7 @@ module.exports = ProjectController =
 			project: (cb)->
 				ProjectGetter.getProject(
 					project_id,
-					{ name: 1, lastUpdated: 1, track_changes: 1, owner_ref: 1, brandVariationId: 1, 'overleaf.history.display': 1 },
+					{ name: 1, lastUpdated: 1, track_changes: 1, owner_ref: 1, brandVariationId: 1, overleaf: 1 },
 					cb
 				)
 			user: (cb)->
@@ -323,6 +323,9 @@ module.exports = ProjectController =
 				if subscription? and subscription.freeTrial? and subscription.freeTrial.expiresAt?
 					allowedFreeTrial = !!subscription.freeTrial.allowed || true
 
+				showGitBridge =
+					user.betaProgram && !project.overleaf?.id? # don't support v1 projects yet
+
 				logger.log project_id:project_id, "rendering editor page"
 				res.render 'project/editor',
 					title:  project.name
@@ -370,7 +373,7 @@ module.exports = ProjectController =
 					brandVariation: brandVariation
 					allowedImageNames: Settings.allowedImageNames || []
 					gitBridgePublicBaseUrl: Settings.gitBridgePublicBaseUrl
-					showGitBridge: req.query?.gitbridge == 'true' || user.isAdmin
+					showGitBridge: showGitBridge
 				timer.done()
 
 	_buildProjectList: (allProjects, v1Projects = [])->