From fbfd160c6d5b6722fb85b81f9193046f6331ffe9 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 22 Mar 2016 14:02:15 +0000 Subject: [PATCH 1/4] default message to empty string --- services/web/public/coffee/main/contact-us.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/public/coffee/main/contact-us.coffee b/services/web/public/coffee/main/contact-us.coffee index 2a3d49d4c4..9596468ec5 100644 --- a/services/web/public/coffee/main/contact-us.coffee +++ b/services/web/public/coffee/main/contact-us.coffee @@ -22,9 +22,9 @@ define [ ticketNumber = Math.floor((1 + Math.random()) * 0x10000).toString(32) params = email: $scope.form.email - message: $scope.form.message + message: $scope.form.message or "" subject: $scope.form.subject + " - [#{ticketNumber}]" - about : $scope.form.project_url + about : $scope.form.project_url or "" labels: "support" Groove.createTicket params, (err, json)-> From a597ebfd90de1f423bc8ef970ffde21de9a2b60c Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 22 Mar 2016 14:13:50 +0000 Subject: [PATCH 2/4] Only show deleted files in track changes view --- services/web/app/views/project/editor/file-tree.jade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/web/app/views/project/editor/file-tree.jade b/services/web/app/views/project/editor/file-tree.jade index 6ca8ff68b8..630cd1aa17 100644 --- a/services/web/app/views/project/editor/file-tree.jade +++ b/services/web/app/views/project/editor/file-tree.jade @@ -75,7 +75,8 @@ aside#file-tree(ng-controller="FileTreeController", ng-class="{ 'multi-selected' li( ng-class="{ 'selected': entity.selected }", ng-repeat="entity in deletedDocs | orderBy:'name'", - ng-controller="FileTreeEntityController" + ng-controller="FileTreeEntityController", + ng-show="ui.view == 'track-changes'" ) .entity .entity-name( From 7fb0249b2bafc62957378a849d639e161ec3be92 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 22 Mar 2016 14:19:46 +0000 Subject: [PATCH 3/4] null check subscription for custom accounts page --- .../Features/Subscription/SubscriptionController.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee index fb378e45f6..f0026bd7f5 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee @@ -85,7 +85,7 @@ module.exports = SubscriptionController = LimitationsManager.userHasSubscriptionOrIsGroupMember user, (err, hasSubOrIsGroupMember, subscription)-> groupLicenceInviteUrl = SubscriptionDomainHandler.getDomainLicencePage(user) if subscription?.customAccount - logger.log user: user, "redirecting to plans" + logger.log user: user, "redirecting to custom account page" res.redirect "/user/subscription/custom_account" else if groupLicenceInviteUrl? and !hasSubOrIsGroupMember logger.log user:user, "redirecting to group subscription invite page" @@ -111,6 +111,10 @@ module.exports = SubscriptionController = userCustomSubscriptionPage: (req, res, next)-> AuthenticationController.getLoggedInUser req, (error, user) -> LimitationsManager.userHasSubscriptionOrIsGroupMember user, (err, hasSubOrIsGroupMember, subscription)-> + if !subscription? + err = new Error("subscription null for custom account, user:#{user?._id}") + logger.warn err:err, "subscription is null for custom accounts page" + return next(err) res.render "subscriptions/custom_account", title: "your_subscription" subscription: subscription From a89edde139263aa85c6d27245223a1471beffcc1 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 22 Mar 2016 14:27:05 +0000 Subject: [PATCH 4/4] subscription tests fixed --- .../coffee/Subscription/SubscriptionControllerTests.coffee | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee b/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee index 631e4b57b6..f2abbe0219 100644 --- a/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee @@ -68,7 +68,9 @@ describe "SubscriptionController sanboxed", -> "./LimitationsManager": @LimitationsManager "../../infrastructure/GeoIpLookup":@GeoIpLookup './RecurlyWrapper': @RecurlyWrapper - "logger-sharelatex": log:-> + "logger-sharelatex": + log:-> + warn:-> "settings-sharelatex": @settings "./SubscriptionDomainHandler":@SubscriptionDomainHandler @@ -273,7 +275,7 @@ describe "SubscriptionController sanboxed", -> describe "userCustomSubscriptionPage", -> beforeEach (done) -> @res.callback = done - @LimitationsManager.userHasSubscriptionOrIsGroupMember.callsArgWith(1, null, true) + @LimitationsManager.userHasSubscriptionOrIsGroupMember.callsArgWith(1, null, true, {}) @SubscriptionController.userCustomSubscriptionPage @req, @res it "should render the page", (done)->