Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 15:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

more tests

Browse Source 
group cover upload tests
registration approval queue tests
This commit is contained in:
barisusakli
2016-12-02 14:05:54 +03:00
parent 68f8f57a34
commit 4b6e4f085d
11 changed files with 356 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/groups/cover.js
View File

@@ -10,7 +10,6 @@ var mime = require('mime');
var winston = require('winston');
var db = require('../database');
var file = require('../file');
var uploadsController = require('../controllers/uploads');
module.exports = function (Groups) {
@@ -25,7 +24,7 @@ module.exports = function (Groups) {
Groups.updateCover = function (uid, data, callback) {
// Position only? That's fine
if (!data.imageData && data.position) {
if (!data.imageData && !data.file && data.position) {
return Groups.updateCoverPosition(data.groupName, data.position, callback);
}
@@ -66,26 +65,19 @@ module.exports = function (Groups) {
Groups.setGroupField(data.groupName, 'cover:thumb:url', uploadData.url, next);
},
function (next) {
fs.unlink(tempPath, next); // Delete temporary file
if (data.position) {
Groups.updateCoverPosition(data.groupName, data.position, next);
} else {
next(null);
}
}
], function (err) {
if (err) {
return fs.unlink(tempPath, function (unlinkErr) {
if (unlinkErr) {
winston.error(unlinkErr);
}
callback(err); // send back original error
});
}
if (data.position) {
Groups.updateCoverPosition(data.groupName, data.position, function (err) {
callback(err, {url: url});
});
} else {
fs.unlink(tempPath, function (unlinkErr) {
if (unlinkErr) {
winston.error(unlinkErr);
}
callback(err, {url: url});
}
});
});
};