From c44f33ce99854d1577ed9490c82598b49f7c8713 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 30 Aug 2016 16:45:21 +0100 Subject: [PATCH 1/2] allow negative values for synctex positions --- .../web/app/coffee/Features/Compile/CompileController.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/Features/Compile/CompileController.coffee b/services/web/app/coffee/Features/Compile/CompileController.coffee index 00f4a880ff..688b746830 100755 --- a/services/web/app/coffee/Features/Compile/CompileController.coffee +++ b/services/web/app/coffee/Features/Compile/CompileController.coffee @@ -151,9 +151,9 @@ module.exports = CompileController = {page, h, v} = req.query if not page?.match(/^\d+$/) return next(new Error("invalid page parameter")) - if not h?.match(/^\d+\.\d+$/) + if not h?.match(/^-?\d+\.\d+$/) return next(new Error("invalid h parameter")) - if not v?.match(/^\d+\.\d+$/) + if not v?.match(/^-?\d+\.\d+$/) return next(new Error("invalid v parameter")) # whether this request is going to a per-user container CompileController._compileAsUser req, (error, user_id) -> From 960ed520b6af1c3540863ea272a596d9be8777c6 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 31 Aug 2016 09:40:40 +0100 Subject: [PATCH 2/2] fix notifications builder @key bug --- .../coffee/Features/Notifications/NotificationsBuilder.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Notifications/NotificationsBuilder.coffee b/services/web/app/coffee/Features/Notifications/NotificationsBuilder.coffee index ffb71f70e6..941f4d4d4d 100644 --- a/services/web/app/coffee/Features/Notifications/NotificationsBuilder.coffee +++ b/services/web/app/coffee/Features/Notifications/NotificationsBuilder.coffee @@ -11,7 +11,7 @@ module.exports = messageOpts = groupName: licence.name subscription_id: licence.subscription_id - logger.log user_id:user._id, key:key, "creating notification key for user" + logger.log user_id:user._id, key:@key, "creating notification key for user" NotificationsHandler.createNotification user._id, @key, "notification_group_invite", messageOpts, null, callback read: (callback = ->)->