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

relative path fix missing ;

Browse Source
This commit is contained in:
barisusakli
2015-01-12 18:52:41 -05:00
parent 1f674f10e2
commit 02dbce57fb
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/modules/navigator.js
View File

@@ -60,7 +60,8 @@ define('navigator', ['forum/pagination'], function(pagination) {
};
function generateUrl(index) {
var parts = window.location.pathname.split('/');
var pathname = window.location.pathname.replace(config.relative_path, '');
var parts = pathname.split('/');
return parts[1] + '/' + parts[2] + '/' + parts[3] + (index ? '/' + index : '');
}

9
src/middleware/middleware.js
View File

@@ -83,7 +83,7 @@ middleware.addSlug = function(req, res, next) {
return next(err);
}
var url = name + encodeURI(slug);
var url = nconf.get('relative_path') + name + encodeURI(slug);
if (res.locals.isAPI) {
res.status(302).json(url);
@@ -95,13 +95,10 @@ middleware.addSlug = function(req, res, next) {
if (!req.params.slug) {
if (req.params.category_id) {
redirect(categories.getCategoryField, req.params.category_id, '/category/');
return redirect(categories.getCategoryField, req.params.category_id, '/category/');
} else if (req.params.topic_id) {
redirect(topics.getTopicField, req.params.topic_id, '/topic/');
} else {
return next();
return redirect(topics.getTopicField, req.params.topic_id, '/topic/');
}
return;
}
next();
};

4
tests/database/hash.js
View File

@@ -16,11 +16,11 @@ describe('Hash methods', function() {
assert.equal(arguments.length, 1);
done();
});
})
});
describe('setObject()', function() {
it('should create a object', function(done) {
db.setObject('testObject2', testData, function(err) {
db.setObject('testObject10', testData, function(err) {
assert.equal(err, null);
assert.equal(arguments.length, 1);
done();