diff --git a/public/src/forum/admin/topics.js b/public/src/forum/admin/topics.js index 77090bef3f..1371e4481c 100644 --- a/public/src/forum/admin/topics.js +++ b/public/src/forum/admin/topics.js @@ -42,8 +42,13 @@ define(function() { loadMoreEl.addEventListener('click', function() { if (this.className.indexOf('disabled') === -1) { - var topics = document.querySelectorAll('.topics li[data-tid]'), - lastTid = parseInt(topics[topics.length - 1].getAttribute('data-tid')); + var topics = document.querySelectorAll('.topics li[data-tid]'); + + if(!topics.length) { + return; + } + + var lastTid = parseInt(topics[topics.length - 1].getAttribute('data-tid')); this.innerHTML = ' Retrieving topics'; socket.emit('api:admin.topics.getMore', { diff --git a/public/src/templates.js b/public/src/templates.js index a5750c0a04..8c439354fd 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -307,6 +307,7 @@ var conditional = makeConditionalRegex(namespace + d); var conditionalBlock = conditional.exec(template); + console.log(conditionalBlock); if (conditionalBlock !== null) { conditionalBlock = conditionalBlock[0].split(''); diff --git a/public/templates/admin/topics.tpl b/public/templates/admin/topics.tpl index f970823db8..f5cb638529 100644 --- a/public/templates/admin/topics.tpl +++ b/public/templates/admin/topics.tpl @@ -1,6 +1,12 @@

Topics


+ +
+ There are no topics. +
+ + +
+ diff --git a/src/routes/admin.js b/src/routes/admin.js index 481891ad00..254d56503d 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -246,7 +246,9 @@ var user = require('./../user.js'), app.get('/topics', function (req, res) { topics.getAllTopics(10, null, function (topics) { res.json({ - topics: topics + topics: topics, + notopics: topics.length === 0, + showLoadMore: topics.length > 0 }); }); });