Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-03-16 14:58:39 -04:00
parent f7d1e58d65 da1858f674
commit 7f8f197e60
8 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -2,7 +2,7 @@
"name": "nodebb", "name": "nodebb",
"license": "GPL-3.0", "license": "GPL-3.0",
"description": "NodeBB Forum", "description": "NodeBB Forum",
"version": "1.4.4", "version": "1.4.5",
"homepage": "http://www.nodebb.org", "homepage": "http://www.nodebb.org",
"repository": { "repository": {
"type": "git", "type": "git",

2
public/src/client/account/edit.js
View File

@@ -188,7 +188,7 @@ define('forum/account/edit', ['forum/account/header', 'translator', 'components'
function handleImageUpload(modal) { function handleImageUpload(modal) {
function onUploadComplete(urlOnServer) { function onUploadComplete(urlOnServer) {
urlOnServer = urlOnServer + '?' + Date.now(); urlOnServer = config.relative_path + urlOnServer + '?' + Date.now();
updateHeader(urlOnServer); updateHeader(urlOnServer);

4
src/plugins.js
View File

@@ -127,7 +127,6 @@ var middleware;
}; };
Plugins.reloadRoutes = function (callback) { Plugins.reloadRoutes = function (callback) {
callback = callback || function () {};
var router = express.Router(); var router = express.Router();
router.hotswapId = 'plugins'; router.hotswapId = 'plugins';
@@ -138,7 +137,8 @@ var middleware;
var controllers = require('./controllers'); var controllers = require('./controllers');
Plugins.fireHook('static:app.load', { app: app, router: router, middleware: middleware, controllers: controllers }, function (err) { Plugins.fireHook('static:app.load', { app: app, router: router, middleware: middleware, controllers: controllers }, function (err) {
if (err) { if (err) {
return winston.error('[plugins] Encountered error while executing post-router plugins hooks: ' + err.message); winston.error('[plugins] Encountered error while executing post-router plugins hooks: ' + err.message);
return callback(err);
} }
hotswap.replace('plugins', router); hotswap.replace('plugins', router);

5
src/routes/index.js
View File

@@ -86,7 +86,7 @@ function groupRoutes(app, middleware, controllers) {
setupPageRoute(app, '/groups/:slug/members', middleware, middlewares, controllers.groups.members); setupPageRoute(app, '/groups/:slug/members', middleware, middlewares, controllers.groups.members);
} }
module.exports = function (app, middleware, hotswapIds) { module.exports = function (app, middleware, hotswapIds, callback) {
var routers = [ var routers = [
express.Router(), // plugin router express.Router(), // plugin router
express.Router(), // main app router express.Router(), // main app router
@@ -210,8 +210,9 @@ module.exports = function (app, middleware, hotswapIds) {
async.apply(user.addInterstitials), async.apply(user.addInterstitials),
], function (err) { ], function (err) {
if (err) { if (err) {
return winston.error(err); return callback(err);
} }
winston.info('Routes added'); winston.info('Routes added');
callback();
}); });
}; };

3
src/user/picture.js
View File

@@ -2,7 +2,6 @@
var async = require('async'); var async = require('async');
var fs = require('fs'); var fs = require('fs');
var nconf = require('nconf');
var winston = require('winston'); var winston = require('winston');
var request = require('request'); var request = require('request');
var mime = require('mime'); var mime = require('mime');
@@ -223,7 +222,7 @@ module.exports = function (User) {
}, },
function (upload, next) { function (upload, next) {
next(null, { next(null, {
url: nconf.get('relative_path') + upload.url, url: upload.url,
path: upload.path, path: upload.path,
name: image.name, name: image.name,
}); });

3
src/webserver.js
View File

@@ -96,8 +96,7 @@ function initializeNodeBB(callback) {
plugins.fireHook('filter:hotswap.prepare', [], next); plugins.fireHook('filter:hotswap.prepare', [], next);
}, },
function (hotswapIds, next) { function (hotswapIds, next) {
routes(app, middleware, hotswapIds); routes(app, middleware, hotswapIds, next);
next();
}, },
function (next) { function (next) {
async.series([ async.series([

2
test/uploads.js
View File

@@ -71,7 +71,7 @@ describe('Upload Controllers', function () {
assert.equal(res.statusCode, 200); assert.equal(res.statusCode, 200);
assert(Array.isArray(body)); assert(Array.isArray(body));
assert.equal(body.length, 1); assert.equal(body.length, 1);
assert.equal(body[0].url, nconf.get('relative_path') + '/assets/uploads/profile/' + regularUid + '-profileavatar.png'); assert.equal(body[0].url, '/assets/uploads/profile/' + regularUid + '-profileavatar.png');
done(); done();
}); });
}); });

2
test/user.js
View File

@@ -525,7 +525,7 @@ describe('User', function () {
}; };
User.uploadPicture(uid, picture, function (err, uploadedPicture) { User.uploadPicture(uid, picture, function (err, uploadedPicture) {
assert.ifError(err); assert.ifError(err);
assert.equal(uploadedPicture.url, nconf.get('relative_path') + '/assets/uploads/profile/' + uid + '-profileavatar.png'); assert.equal(uploadedPicture.url, '/assets/uploads/profile/' + uid + '-profileavatar.png');
assert.equal(uploadedPicture.path, path.join(nconf.get('base_dir'), 'public', 'uploads', 'profile', uid + '-profileavatar.png')); assert.equal(uploadedPicture.path, path.join(nconf.get('base_dir'), 'public', 'uploads', 'profile', uid + '-profileavatar.png'));
done(); done();
}); });