style changes

v1.18.x
Barış Soner Uşaklı
parent 67ca1881bd
commit cc4f4e7282

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

@ -30,17 +30,14 @@ module.exports = function (SocketTopics) {
topicData.tid = tid; topicData.tid = tid;
topics.tools.move(tid, data.cid, socket.uid, next); topics.tools.move(tid, data.cid, socket.uid, next);
}, },
], function (err) { function (next) {
if (err) {
return next(err);
}
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); }, callback);
}; };

Loading…
Cancel
Save