hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #5944

Browse Source
v1.18.x
Baris Usakli 8 years ago
parent 681e8074d2
commit 500c978a26
6 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File

4
package.json
Unescape Escape View File

@ -66,9 +66,9 @@
"nodebb-plugin-spam-be-gone": "0.5.1",
"nodebb-rewards-essentials": "0.0.9",
"nodebb-theme-lavender": "4.1.1",
"nodebb-theme-persona": "6.1.2",
"nodebb-theme-persona": "6.1.3",
"nodebb-theme-slick": "1.1.1",
"nodebb-theme-vanilla": "7.1.1",
"nodebb-theme-vanilla": "7.1.2",
"nodebb-widget-essentials": "3.0.7",
"nodemailer": "4.1.1",
"passport": "^0.4.0",

2
public/language/en-GB/admin/settings/pagination.json
Unescape Escape View File

@ -3,7 +3,9 @@
"enable": "Paginate topics and posts instead of using infinite scroll.",
"topics": "Topic Pagination",
"posts-per-page": "Posts per Page",
"max-posts-per-page": "Maximum posts per page",
"categories": "Category Pagination",
"topics-per-page": "Topics per Page",
"max-topics-per-page": "Maximum topics per page",
"initial-num-load": "Initial Number of Topics to Load on Unread, Recent, and Popular"
}

1
public/language/en-GB/user.json
Unescape Escape View File

@ -102,6 +102,7 @@
"paginate_description" : "Paginate topics and posts instead of using infinite scroll",
"topics_per_page": "Topics per Page",
"posts_per_page": "Posts per Page",
"max_items_per_page": "Maximum %1",
"notification_sounds" : "Play a sound when you receive a notification",
"notifications_and_sounds": "Notifications & Sounds",

19
src/controllers/accounts/settings.js
Unescape Escape View File

@ -12,9 +12,7 @@ var db = require('../../database');
var helpers = require('../helpers');
var accountHelpers = require('./helpers');
var settingsController = {};
var settingsController = module.exports;
settingsController.get = function (req, res, callback) {
var userData;
@ -91,15 +89,9 @@ settingsController.get = function (req, res, callback) {
next(err, data);
});
},
function (data, next) {
function (data) {
userData.customSettings = data.customSettings;
userData.disableEmailSubscriptions = parseInt(meta.config.disableEmailSubscriptions, 10) === 1;
next();
},
], function (err) {
if (err) {
return callback(err);
}
userData.dailyDigestFreqOptions = [
{ value: 'off', name: '[[user:digest_off]]', selected: userData.settings.dailyDigestFreq === 'off' },
@ -108,7 +100,6 @@ settingsController.get = function (req, res, callback) {
{ value: 'month', name: '[[user:digest_monthly]]', selected: userData.settings.dailyDigestFreq === 'month' },
];
userData.bootswatchSkinOptions = [
{ name: 'No skin', value: 'noskin' },
{ name: 'Default', value: 'default' },
@ -147,11 +138,15 @@ settingsController.get = function (req, res, callback) {
userData.inTopicSearchAvailable = plugins.hasListeners('filter:topic.search');
userData.maxTopicsPerPage = parseInt(meta.config.maxTopicsPerPage, 10) || 20;
userData.maxPostsPerPage = parseInt(meta.config.maxPostsPerPage, 10) || 20;
userData.title = '[[pages:account/settings]]';
userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[user:settings]]' }]);
res.render('account/settings', userData);
});
},
], callback);
};

14
src/user/settings.js
Unescape Escape View File

@ -135,12 +135,14 @@ module.exports = function (User) {
}
User.saveSettings = function (uid, data, callback) {
if (!data.postsPerPage || parseInt(data.postsPerPage, 10) <= 1 || parseInt(data.postsPerPage, 10) > meta.config.postsPerPage) {
return callback(new Error('[[error:invalid-pagination-value, 2, ' + meta.config.postsPerPage + ']]'));
var maxPostsPerPage = meta.config.maxPostsPerPage || 20;
if (!data.postsPerPage || parseInt(data.postsPerPage, 10) <= 1 || parseInt(data.postsPerPage, 10) > maxPostsPerPage) {
return callback(new Error('[[error:invalid-pagination-value, 2, ' + maxPostsPerPage + ']]'));
}
if (!data.topicsPerPage || parseInt(data.topicsPerPage, 10) <= 1 || parseInt(data.topicsPerPage, 10) > meta.config.topicsPerPage) {
return callback(new Error('[[error:invalid-pagination-value, 2, ' + meta.config.topicsPerPage + ']]'));
var maxTopicsPerPage = meta.config.maxTopicsPerPage || 20;
if (!data.topicsPerPage || parseInt(data.topicsPerPage, 10) <= 1 || parseInt(data.topicsPerPage, 10) > maxTopicsPerPage) {
return callback(new Error('[[error:invalid-pagination-value, 2, ' + maxTopicsPerPage + ']]'));
}
data.userLang = data.userLang || meta.config.defaultLang;
@ -153,8 +155,8 @@ module.exports = function (User) {
openOutgoingLinksInNewTab: data.openOutgoingLinksInNewTab,
dailyDigestFreq: data.dailyDigestFreq || 'off',
usePagination: data.usePagination,
topicsPerPage: Math.min(data.topicsPerPage, parseInt(meta.config.topicsPerPage, 10) || 20),
postsPerPage: Math.min(data.postsPerPage, parseInt(meta.config.postsPerPage, 10) || 20),
topicsPerPage: Math.min(data.topicsPerPage, parseInt(maxTopicsPerPage, 10) || 20),
postsPerPage: Math.min(data.postsPerPage, parseInt(maxPostsPerPage, 10) || 20),
userLang: data.userLang || meta.config.defaultLang,
followTopicsOnCreate: data.followTopicsOnCreate,
followTopicsOnReply: data.followTopicsOnReply,

4
src/views/admin/settings/pagination.tpl
Unescape Escape View File

@ -18,7 +18,8 @@
<div class="col-sm-2 col-xs-12 settings-header">[[admin/settings/pagination:topics]]</div>
<div class="col-sm-10 col-xs-12">
<form>
<strong>[[admin/settings/pagination:posts-per-page]]</strong><br /> <input type="text" class="form-control" value="20" data-field="postsPerPage">
<strong>[[admin/settings/pagination:posts-per-page]]</strong><br /> <input type="text" class="form-control" value="20" data-field="postsPerPage"><br/>
<strong>[[admin/settings/pagination:max-posts-per-page]]</strong><br /> <input type="text" class="form-control" value="20" data-field="maxPostsPerPage"><br/>
</form>
</div>
</div>
@ -28,6 +29,7 @@
<div class="col-sm-10 col-xs-12">
<form>
<strong>[[admin/settings/pagination:topics-per-page]]</strong><br /> <input type="text" class="form-control" value="20" data-field="topicsPerPage"><br />
<strong>[[admin/settings/pagination:max-topics-per-page]]</strong><br /> <input type="text" class="form-control" value="20" data-field="maxTopicsPerPage"><br/>
<strong>[[admin/settings/pagination:initial-num-load]]</strong><br /> <input type="text" class="form-control" value="20" data-field="topicsPerList">
</form>
</div>

Write Preview
Loading…
Cancel
Save