From 93883c7a0361860a8c9b3e8fa6553e05401bad97 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 15 May 2014 15:43:04 +0100 Subject: [PATCH 1/2] Fix calling of updateDoc --- .../app/coffee/Features/Project/ProjectEntityHandler.coffee | 2 +- .../UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee index dfbfb26a9d..66e7359389 100644 --- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee @@ -123,7 +123,7 @@ module.exports = ProjectEntityHandler = doc = new Doc name: docName Project.putElement project._id, folder_id, doc, "doc", (err, result)=> return callback(err) if err? - DocstoreManager.updateDoc project._id.toString(), doc._id.toString(), docLines, 0, (err, modified, rev) -> + DocstoreManager.updateDoc project._id.toString(), doc._id.toString(), docLines, (err, modified, rev) -> return callback(err) if err? tpdsUpdateSender.addDoc { project_id: project._id, diff --git a/services/web/test/UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee b/services/web/test/UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee index 77d8232d4b..0932ea5d25 100644 --- a/services/web/test/UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee +++ b/services/web/test/UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee @@ -305,7 +305,7 @@ describe 'ProjectEntityHandler', -> @ProjectModel.putElement = sinon.stub().callsArgWith(4, null, {path:{fileSystem:@path}}) @callback = sinon.stub() @tpdsUpdateSender.addDoc = sinon.stub().callsArg(2) - @DocstoreManager.updateDoc = sinon.stub().callsArgWith(4, null, true, 0) + @DocstoreManager.updateDoc = sinon.stub().callsArgWith(3, null, true, 0) @ProjectEntityHandler.addDoc project_id, folder_id, @name, @lines, @callback @@ -335,7 +335,7 @@ describe 'ProjectEntityHandler', -> it "should send the doc lines to the doc store", -> @DocstoreManager.updateDoc - .calledWith(project_id, @doc._id.toString(), @lines, 0) + .calledWith(project_id, @doc._id.toString(), @lines) .should.equal true describe 'adding file', -> From e72dd5008960e246edd26a694b04d121a71f4f77 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 15 May 2014 16:32:17 +0100 Subject: [PATCH 2/2] Use configurable uploads folder location --- services/web/app/coffee/infrastructure/Server.coffee | 2 +- services/web/config/settings.defaults.coffee | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/infrastructure/Server.coffee b/services/web/app/coffee/infrastructure/Server.coffee index b1ae781b77..22600b4e39 100644 --- a/services/web/app/coffee/infrastructure/Server.coffee +++ b/services/web/app/coffee/infrastructure/Server.coffee @@ -41,7 +41,7 @@ app.configure ()-> app.use express.static(__dirname + '/../../../public', {maxAge: staticCacheAge }) app.set 'views', __dirname + '/../../views' app.set 'view engine', 'jade' - app.use express.bodyParser(uploadDir: __dirname + "/../../../data/uploads") + app.use express.bodyParser(uploadDir: Settings.path.uploadFolder) app.use cookieParser app.use express.session proxy: true diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 5bbcd2ed1c..15667fdd0c 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -196,7 +196,8 @@ module.exports = # If we ever need to write something to disk (e.g. incoming requests # that need processing but may be too big for memory, then write # them to disk here). - dumpFolder: Path.resolve "data/dumpFolder" + dumpFolder: Path.resolve __dirname + "/../data/dumpFolder" + uploadFolder: Path.resolve __dirname + "/../data/uploads" # Automatic Snapshots # -------------------