Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-05 23:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

style changes

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-07-15 16:57:41 -04:00
parent 67ca1881bd
commit cc4f4e7282
2 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/controllers/categories.js
View File

@@ -7,7 +7,7 @@ var categories = require('../categories');
var meta = require('../meta');
var helpers = require('./helpers');
var categoriesController = {};
var categoriesController = module.exports;
categoriesController.list = function (req, res, next) {
res.locals.metaTags = [{
@@ -34,32 +34,27 @@ categoriesController.list = function (req, res, next) {
categories.getRecentTopicReplies(allCategories, req.uid, next);
},
], function (err) {
if (err) {
return next(err);
}
function () {
var data = {
title: '[[pages:categories]]',
categories: categoryData,
};
var data = {
title: '[[pages:categories]]',
categories: categoryData,
};
if (req.path.startsWith('/api/categories') || req.path.startsWith('/categories')) {
data.breadcrumbs = helpers.buildBreadcrumbs([{ text: data.title }]);
}
data.categories.forEach(function (category) {
if (category && Array.isArray(category.posts) && category.posts.length) {
category.teaser = {
url: nconf.get('relative_path') + '/topic/' + category.posts[0].topic.slug + '/' + category.posts[0].index,
timestampISO: category.posts[0].timestampISO,
pid: category.posts[0].pid,
};
if (req.path.startsWith('/api/categories') || req.path.startsWith('/categories')) {
data.breadcrumbs = helpers.buildBreadcrumbs([{ text: data.title }]);
}
});
res.render('categories', data);
});
data.categories.forEach(function (category) {
if (category && Array.isArray(category.posts) && category.posts.length) {
category.teaser = {
url: nconf.get('relative_path') + '/post/' + category.posts[0].pid,
timestampISO: category.posts[0].timestampISO,
pid: category.posts[0].pid,
};
}
});
res.render('categories', data);
},
], next);
};
module.exports = categoriesController;

15
src/socket.io/topics/move.js
View File

@@ -30,17 +30,14 @@ module.exports = function (SocketTopics) {
topicData.tid = tid;
topics.tools.move(tid, data.cid, socket.uid, next);
},
], function (err) {
if (err) {
return next(err);
}
function (next) {
socketHelpers.emitToTopicAndCategory('event:topic_moved', topicData);
socketHelpers.emitToTopicAndCategory('event:topic_moved', topicData);
socketHelpers.sendNotificationToTopicOwner(tid, socket.uid, 'move', 'notifications:moved_your_topic');
socketHelpers.sendNotificationToTopicOwner(tid, socket.uid, 'move', 'notifications:moved_your_topic');
next();
});
next();
},
], next);
}, callback);
};