Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-04 06:40:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #5602

Browse Source
This commit is contained in:
barisusakli
2017-04-18 14:21:28 -04:00
parent 236758b712
commit 7b91da067b
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/language/en-GB/admin/settings/post.json
View File

@@ -29,6 +29,8 @@
"unread": "Unread Settings",
"unread.cutoff": "Unread cutoff days",
"unread.min-track-last": "Minimum posts in topic before tracking last read",
"recent": "Recent Settings",
"recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page",
"signature": "Signature Settings",
"signature.disable": "Disable signatures",
"signature.no-links": "Disable links in signatures",

3
src/topics/recent.js
View File

@@ -8,6 +8,7 @@ var plugins = require('../plugins');
var privileges = require('../privileges');
var user = require('../user');
var categories = require('../categories');
var meta = require('../meta');
module.exports = function (Topics) {
var terms = {
@@ -65,7 +66,7 @@ module.exports = function (Topics) {
function (tids, next) {
async.parallel({
ignoredCids: function (next) {
if (filter === 'watched') {
if (filter === 'watched' || parseInt(meta.config.disableRecentCategoryFilter, 10) === 1) {
return next(null, []);
}
user.getIgnoredCategories(uid, next);

20
src/views/admin/settings/post.tpl
View File

@@ -123,9 +123,23 @@
<input id="unreadCutoff" type="text" class="form-control" value="2" data-field="unreadCutoff">
</div>
<div class="form-group">
<label for="bookmarkthreshold">[[admin/settings/post:unread.min-track-last]]</label>
<input id="bookmarkthreshold" type="text" class="form-control" value="5" data-field="bookmarkThreshold">
</div>
<label for="bookmarkthreshold">[[admin/settings/post:unread.min-track-last]]</label>
<input id="bookmarkthreshold" type="text" class="form-control" value="5" data-field="bookmarkThreshold">
</div>
</form>
</div>
</div>
<div class="row">
<div class="col-sm-2 col-xs-12 settings-header">[[admin/settings/post:recent]]</div>
<div class="col-sm-10 col-xs-12">
<form>
<div class="checkbox">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
<input class="mdl-switch__input" type="checkbox" data-field="disableRecentCategoryFilter">
<span class="mdl-switch__label"><strong>[[admin/settings/post:recent.categoryFilter.disable]]</strong></span>
</label>
</div>
</form>
</div>
</div>