github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-22 02:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

if you are alread in the group show the custom group page

Browse source
This commit is contained in:
Henry Oswald 2015-05-27 15:50:28 +01:00
parent 79fa49a43d
commit 72e528e9d1
2 changed files with 10 additions and 10 deletions
services/web
app/coffee/Features/Subscription
SubscriptionGroupController.coffee
test/UnitTests/coffee/Subscription
SubscriptionControllerTests.coffee

16
services/web/app/coffee/Features/Subscription/SubscriptionGroupController.coffee
View file

@ -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

4
services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee
View file

@ -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