Просмотр исходного кода

Merge pull request #296 from sharelatex/ja-show-v2-message

Show v2 message if awareOfV2 flag set
James Allen 8 лет назад
Родитель
Сommit
c89bbd7588

+ 1 - 1
services/web/app/coffee/Features/Project/ProjectController.coffee

@@ -157,7 +157,7 @@ module.exports = ProjectController =
 			hasSubscription: (cb)->
 				LimitationsManager.userHasSubscriptionOrIsGroupMember currentUser, cb
 			user: (cb) ->
-				User.findById user_id, "featureSwitches overleaf", cb
+				User.findById user_id, "featureSwitches overleaf awareOfV2", cb
 			}, (err, results)->
 				if err?
 					logger.err err:err, "error getting data for project list page"

+ 1 - 0
services/web/app/coffee/models/User.coffee

@@ -63,6 +63,7 @@ UserSchema = new Schema
 		id: { type: Number }
 		accessToken: { type: String }
 		refreshToken: { type: String }
+	awareOfV2: { type:Boolean, default: false }
 
 conn = mongoose.createConnection(Settings.mongo.url, {
 	server: {poolSize: Settings.mongo.poolSize || 10},

+ 8 - 0
services/web/app/views/project/list/notifications.pug

@@ -1,3 +1,11 @@
+if (user.awareOfV2 && !settings.overleaf)
+	.alert.alert-info.small
+		a.pull-right.btn.btn-info.btn-sm(href="/user/login_to_ol_v2" style="margin-left: 12px") Click here to try Overleaf v2
+		p
+			| ShareLaTeX is joining Overleaf and will become <em>Overleaf v2</em> in late 2018 (<a href="https://www.overleaf.com/help/342-overleaf-v2-faq">read more</a>).
+			<br/>
+			| We’re beta testing Overleaf v2 now and you can try it out with your ShareLaTeX account.
+
 span(ng-controller="NotificationsController").userNotifications
 	ul.list-unstyled.notifications-list(
 		ng-if="notifications.length > 0",