diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index d39046d543..e59e34ee3f 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -41,7 +41,7 @@ app.onDomReady(); }, 3600000); } - require(['hooks'], (hooks) => { + require(['hooks', 'admin/settings'], (hooks, Settings) => { hooks.on('action:ajaxify.end', (data) => { updatePageTitle(data.url); setupRestartLinks(); @@ -54,10 +54,10 @@ app.onDomReady(); }); if ($('.settings').length) { - require(['admin/settings'], function (Settings) { - Settings.prepare(); - Settings.populateTOC(); - }); + Settings.prepare(); + } + if ($('[component="settings/toc"]').length) { + Settings.populateTOC(); } }); hooks.on('action:ajaxify.start', function () { diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index adfec55339..591ad5d22b 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -143,7 +143,7 @@ define('admin/settings', [ saveBtnEl.classList.toggle('saved', true); setTimeout(() => { saveBtnEl.classList.toggle('saved', false); - }, 2500); + }, 1500); } }; diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js index 4f90161bc3..5edeb37e51 100644 --- a/public/src/modules/settings.js +++ b/public/src/modules/settings.js @@ -557,7 +557,7 @@ define('settings', ['hooks', 'alerts'], function (hooks, alerts) { saveBtn.classList.toggle('saved', true); setTimeout(() => { saveBtn.classList.toggle('saved', false); - }, 5000); + }, 1500); } }); } diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js index 2bf0c3a9e8..110fbadd40 100644 --- a/src/controllers/admin/users.js +++ b/src/controllers/admin/users.js @@ -162,7 +162,7 @@ usersController.search = async function (req, res) { async function loadUserInfo(callerUid, uids) { async function getIPs() { - return await Promise.all(uids.map(uid => db.getSortedSetRevRange(`uid:${uid}:ip`, 0, -1))); + return await Promise.all(uids.map(uid => db.getSortedSetRevRange(`uid:${uid}:ip`, 0, 4))); } async function getConfirmObjs() { const keys = uids.map(uid => `confirm:byUid:${uid}`); diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index de75251e13..8f556b19d3 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -108,7 +108,7 @@ {users.username} -