diff --git a/src/backupdb.js b/src/backupdb.js index 958a00937..109b50e98 100644 --- a/src/backupdb.js +++ b/src/backupdb.js @@ -32,13 +32,14 @@ function postProcess(result) { delete result.restoreConfigJson; } -function getPaged(page, perPage, callback) { +function getPaged(type, page, perPage, callback) { + assert(type === exports.BACKUP_TYPE_APP || type === exports.BACKUP_TYPE_BOX); assert(typeof page === 'number' && page > 0); assert(typeof perPage === 'number' && perPage > 0); assert.strictEqual(typeof callback, 'function'); database.query('SELECT ' + BACKUPS_FIELDS + ' FROM backups WHERE type = ? AND state = ? ORDER BY creationTime DESC LIMIT ?,?', - [ exports.BACKUP_TYPE_BOX, exports.BACKUP_STATE_NORMAL, (page-1)*perPage, perPage ], function (error, results) { + [ type, exports.BACKUP_STATE_NORMAL, (page-1)*perPage, perPage ], function (error, results) { if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error)); results.forEach(function (result) { postProcess(result); }); diff --git a/src/backups.js b/src/backups.js index f59b9d018..7c78c3329 100644 --- a/src/backups.js +++ b/src/backups.js @@ -109,7 +109,7 @@ function getPaged(page, perPage, callback) { assert(typeof perPage === 'number' && perPage > 0); assert.strictEqual(typeof callback, 'function'); - backupdb.getPaged(page, perPage, function (error, results) { + backupdb.getPaged(backupdb.BACKUP_TYPE_BOX, page, perPage, function (error, results) { if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error)); callback(null, results); diff --git a/src/test/database-test.js b/src/test/database-test.js index 6a1516ada..b7171f245 100644 --- a/src/test/database-test.js +++ b/src/test/database-test.js @@ -1052,7 +1052,7 @@ describe('database', function () { }); it('getPaged succeeds', function (done) { - backupdb.getPaged(1, 5, function (error, results) { + backupdb.getPaged(backupdb.BACKUP_TYPE_BOX, 1, 5, function (error, results) { expect(error).to.be(null); expect(results).to.be.an(Array); expect(results.length).to.be(1);