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

return privileges in category

Browse Source
This commit is contained in:
barisusakli
2014-04-16 14:30:36 -04:00
parent 5b8fcbe27e
commit 01555cbb5c
3 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/src/forum/category.js
View File

@@ -225,11 +225,13 @@ define(['composer', 'forum/pagination', 'share', 'navigator'], function(composer
});
}
Category.onTopicsLoaded = function(topics, callback) {
if(!topics || !topics.length) {
Category.onTopicsLoaded = function(data, callback) {
if(!data || !data.topics.length) {
return;
}
var topics = data.topics;
function removeAlreadyAddedTopics() {
topics = topics.filter(function(topic) {
return $('#topics-container li[data-tid="' + topic.tid +'"]').length === 0;
@@ -261,7 +263,7 @@ define(['composer', 'forum/pagination', 'share', 'navigator'], function(composer
findInsertionPoint();
ajaxify.loadTemplate('category', function(categoryTemplate) {
var html = templates.parse(templates.getBlock(categoryTemplate, 'topics'), {topics: topics});
var html = templates.parse(templates.getBlock(categoryTemplate, 'topics'), data);
translator.translate(html, function(translatedHTML) {
var container = $('#topics-container'),
@@ -309,6 +311,7 @@ define(['composer', 'forum/pagination', 'share', 'navigator'], function(composer
cid: cid,
after: after
}, function (err, data) {
console.log(data);
loadingMoreTopics = false;
if(err) {
@@ -316,7 +319,7 @@ define(['composer', 'forum/pagination', 'share', 'navigator'], function(composer
}
if (data && data.topics.length) {
Category.onTopicsLoaded(data.topics, callback);
Category.onTopicsLoaded(data, callback);
$('#topics-container').attr('data-nextstart', data.nextStart);
} else {

8
src/controllers/categories.js
View File

@@ -68,15 +68,15 @@ categoriesController.get = function(req, res, next) {
async.waterfall([
function(next) {
categoryTools.privileges(cid, uid, function(err, categoryPrivileges) {
if (!err) {
if (err) {
return next(err);
}
if (!categoryPrivileges.read) {
next(new Error('[[error:no-privileges]]'));
} else {
next(null, categoryPrivileges);
}
} else {
next(err);
}
});
},
function (privileges, next) {

26
src/socket.io/categories.js
View File

@@ -1,6 +1,7 @@
'use strict';
var categories = require('../categories'),
var async = require('async'),
categories = require('../categories'),
categoryTools = require('../categoryTools'),
meta = require('./../meta'),
user = require('./../user'),
@@ -30,12 +31,29 @@ SocketCategories.loadMore = function(socket, data, callback) {
return callback(new Error('[[error:invalid-data]]'));
}
user.getSettings(socket.uid, function(err, settings) {
async.parallel({
privileges: function(next) {
categoryTools.privileges(data.cid, socket.uid, next);
},
settings: function(next) {
user.getSettings(socket.uid, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
var start = parseInt(data.after, 10),
end = start + settings.topicsPerPage - 1;
end = start + results.settings.topicsPerPage - 1;
categories.getCategoryTopics(data.cid, start, end, socket.uid, callback);
categories.getCategoryTopics(data.cid, start, end, socket.uid, function(err, data) {
if (err) {
return callback(err);
}
data.privileges = results.privileges;
callback(null, data);
});
});
};