Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #11594

Browse Source 
set the order of theme to same as the on it's replacing
This commit is contained in:
Barış Soner Uşaklı
2023-05-11 22:39:37 -04:00
parent cd7fdfcefd
commit 85d104c375
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/meta/themes.js
View File

@@ -89,9 +89,9 @@ Themes.set = async (data) => {
switch (data.type) { switch (data.type) {
case 'local': { case 'local': {
const current = await Meta.configs.get('theme:id'); const current = await Meta.configs.get('theme:id');
const score = await db.sortedSetScore('plugins:active', current);
await db.sortedSetRemove('plugins:active', current); await db.sortedSetRemove('plugins:active', current);
const numPlugins = await db.sortedSetCard('plugins:active'); await db.sortedSetAdd('plugins:active', score || 0, data.id);
await db.sortedSetAdd('plugins:active', numPlugins, data.id);
if (current !== data.id) { if (current !== data.id) {
const pathToThemeJson = path.join(nconf.get('themes_path'), data.id, 'theme.json'); const pathToThemeJson = path.join(nconf.get('themes_path'), data.id, 'theme.json');
@@ -103,9 +103,9 @@ Themes.set = async (data) => {
config = JSON.parse(config); config = JSON.parse(config);
const activePluginsConfig = nconf.get('plugins:active'); const activePluginsConfig = nconf.get('plugins:active');
if (!activePluginsConfig) { if (!activePluginsConfig) {
const score = await db.sortedSetScore('plugins:active', current);
await db.sortedSetRemove('plugins:active', current); await db.sortedSetRemove('plugins:active', current);
const numPlugins = await db.sortedSetCard('plugins:active'); await db.sortedSetAdd('plugins:active', score || 0, data.id);
await db.sortedSetAdd('plugins:active', numPlugins, data.id);
} else if (!activePluginsConfig.includes(data.id)) { } else if (!activePluginsConfig.includes(data.id)) {
// This prevents changing theme when configuration doesn't include it, but allows it otherwise // This prevents changing theme when configuration doesn't include it, but allows it otherwise
winston.error(`When defining active plugins in configuration, changing themes requires adding the theme '${data.id}' to the list of active plugins before updating it in the ACP`); winston.error(`When defining active plugins in configuration, changing themes requires adding the theme '${data.id}' to the list of active plugins before updating it in the ACP`);