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

template changes to recent and unread

Browse Source
This commit is contained in:
Baris Usakli
2013-11-04 16:00:34 -05:00
parent 6b4520e526
commit 1ec6726459
4 changed files with 96 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/topics.js
View File

@@ -306,7 +306,14 @@ var RDB = require('./redis.js'),
});
}
async.parallel([getUserInfo, hasReadTopic, getTeaserInfo, getPrivileges], function(err, results) {
function getCategoryInfo(next) {
categories.getCategoryFields(topicData.cid, ['name', 'slug', 'icon'], function(err, categoryData) {
console.log(categoryData);
next(err, categoryData);
});
}
async.parallel([getUserInfo, hasReadTopic, getTeaserInfo, getPrivileges, getCategoryInfo], function(err, results) {
callback({
username: results[0].username,
userslug: results[0].userslug,
@@ -314,7 +321,8 @@ var RDB = require('./redis.js'),
userbanned: results[0].banned,
hasread: results[1],
teaserInfo: results[2],
privileges: results[3]
privileges: results[3],
categoryData: results[4]
});
});
}
@@ -339,13 +347,15 @@ var RDB = require('./redis.js'),
topicData.username = topicInfo.username;
topicData.userslug = topicInfo.userslug;
topicData.picture = topicInfo.picture;
topicData.categoryIcon = topicInfo.categoryData.icon;
topicData.categoryName = topicInfo.categoryData.name;
topicData.categorySlug = topicInfo.categoryData.slug;
topicData.badgeclass = (topicInfo.hasread && current_user != 0) ? '' : 'badge-important';
topicData.teaser_text = topicInfo.teaserInfo.text || '',
topicData.teaser_username = topicInfo.teaserInfo.username || '';
topicData.teaser_userslug = topicInfo.teaserInfo.userslug || '';
topicData.teaser_userpicture = topicInfo.teaserInfo.picture || require('gravatar').url('', {}, https = nconf.get('https'));
topicData.teaser_pid = topicInfo.teaserInfo.pid;
topicData.teaser_timestamp = topicInfo.teaserInfo.timestamp ? (new Date(parseInt(topicInfo.teaserInfo.timestamp, 10)).toISOString()) : '';
if (isTopicVisible(topicData, topicInfo))