Merge pull request #314 from sharelatex/ja-login-improvements

Ja login improvements

services/web/app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee

@@ -99,13 +99,17 @@ module.exports = AuthorizationMiddlewear =
 		callback null, user_id
 		
 	redirectToRestricted: (req, res, next) ->
-		res.redirect "/restricted"
+		res.redirect "/restricted?from=#{encodeURIComponent(req.url)}"
 	
 	restricted : (req, res, next)->
 		if req.session.user?
 			res.render 'user/restricted',
 				title:'restricted'
 		else
-			logger.log "user not logged in and trying to access #{req.url}, being redirected to login"
-			res.redirect '/register'
+			from = req.query.from
+			logger.log {from: from}, "redirecting to login"
+			redirect_to = "/login"
+			if from?
+				redirect_to += "?redir=#{encodeURIComponent(from)}"
+			res.redirect redirect_to
 		

services/web/app/views/project/list/side-bar.jade

@@ -155,6 +155,6 @@
 							| #{translate("or_unlock_features_bonus")} 
 							a(href="/user/bonus") #{translate("sharing_sl")} .
 script.
-	window.userHasNoSubscription = #{settings.enableSubscriptions && !hasSubscription}
+	window.userHasNoSubscription = #{!!(settings.enableSubscriptions && !hasSubscription)}