mirror of
https://github.com/overleaf/overleaf.git
synced 2025-03-15 04:14:47 +00:00
if you are alread in the group show the custom group page
This commit is contained in:
parent
79fa49a43d
commit
72e528e9d1
2 changed files with 10 additions and 10 deletions
|
@ -6,6 +6,7 @@ settings = require("settings-sharelatex")
|
|||
OneTimeTokenHandler = require("../Security/OneTimeTokenHandler")
|
||||
EmailHandler = require("../Email/EmailHandler")
|
||||
SubscriptionDomainAllocator = require("./SubscriptionDomainAllocator")
|
||||
_ = require("underscore")
|
||||
|
||||
module.exports =
|
||||
|
||||
|
@ -41,11 +42,14 @@ module.exports =
|
|||
renderGroupInvitePage: (req, res)->
|
||||
subscription_id = req.params.subscription_id
|
||||
licence = SubscriptionDomainAllocator.findDomainLicenceBySubscriptionId(subscription_id)
|
||||
|
||||
res.render "subscriptions/group/invite",
|
||||
title: "Group Invitation"
|
||||
subscription_id:subscription_id
|
||||
licenceName:licence.name
|
||||
SubscriptionGroupHandler.getPopulatedListOfMembers licence.adminUser_id, (err, users)->
|
||||
userInSubscription = _.find users, (user)-> user._id == req.session.user._id
|
||||
if userInSubscription?
|
||||
return res.redirect("/user/subscription/custom_account")
|
||||
res.render "subscriptions/group/invite",
|
||||
title: "Group Invitation"
|
||||
subscription_id:subscription_id
|
||||
licenceName:licence.name
|
||||
|
||||
beginJoinGroup: (req, res)->
|
||||
subscription_id = req.params.subscription_id
|
||||
|
@ -69,7 +73,7 @@ module.exports =
|
|||
return res.send 403
|
||||
SubscriptionLocator.getSubscription subscription_id, (err, subscription)->
|
||||
SubscriptionGroupHandler.addUserToGroup subscription.admin_id, req.user.email, (err, user)->
|
||||
res.redir "#{settings.siteUrl}/user/subscription/#{subscription_id}/group/successful-join"
|
||||
res.redirect "#{settings.siteUrl}/user/subscription/#{subscription_id}/group/successful-join"
|
||||
|
||||
renderSuccessfulJoinPage: (req, res)->
|
||||
subscription_id = req.params.subscription_id
|
||||
|
|
|
@ -233,10 +233,6 @@ describe "SubscriptionController sanboxed", ->
|
|||
it "should render the dashboard", ->
|
||||
@res.renderedTemplate.should.equal "subscriptions/dashboard"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
describe "with a user with a paid subscription", ->
|
||||
beforeEach (done) ->
|
||||
@res.callback = done
|
||||
|
|
Loading…
Reference in a new issue