From 72e528e9d16a550e08bd9e6849571fb81fb3004f Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 27 May 2015 15:50:28 +0100 Subject: [PATCH] if you are alread in the group show the custom group page --- .../SubscriptionGroupController.coffee | 16 ++++++++++------ .../SubscriptionControllerTests.coffee | 4 ---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionGroupController.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionGroupController.coffee index b9f3d29343..3659f91c8f 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionGroupController.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionGroupController.coffee @@ -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 diff --git a/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee b/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee index 71fd9f51a5..18488c0fe7 100644 --- a/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee @@ -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