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

fix: tests

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-10-14 20:02:32 -04:00
parent d89477cad0
commit b295d15eae
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/webserver.js
View File

@@ -8,6 +8,7 @@ var os = require('os');
var nconf = require('nconf'); var nconf = require('nconf');
var express = require('express'); var express = require('express');
var app = express(); var app = express();
app.renderAsync = util.promisify((tpl, data, callback) => app.render(tpl, data, callback));
var server; var server;
var winston = require('winston'); var winston = require('winston');
var async = require('async'); var async = require('async');
@@ -116,8 +117,6 @@ function setupExpressApp(app) {
const relativePath = nconf.get('relative_path'); const relativePath = nconf.get('relative_path');
const viewsDir = nconf.get('views_dir'); const viewsDir = nconf.get('views_dir');
app.renderAsync = util.promisify((tpl, data, callback) => app.render(tpl, data, callback));
app.engine('tpl', function (filepath, data, next) { app.engine('tpl', function (filepath, data, next) {
filepath = filepath.replace(/\.tpl$/, '.js'); filepath = filepath.replace(/\.tpl$/, '.js');

4
src/widgets/admin.js
View File

@@ -1,6 +1,6 @@
'use strict'; 'use strict';
const app = require('../webserver').app; const webserver = require('../webserver');
const plugins = require('../plugins'); const plugins = require('../plugins');
const groups = require('../groups'); const groups = require('../groups');
const index = require('./index'); const index = require('./index');
@@ -54,7 +54,7 @@ async function getAvailableWidgets() {
async function renderAdminTemplate() { async function renderAdminTemplate() {
const groupsData = await groups.getNonPrivilegeGroups('groups:createtime', 0, -1); const groupsData = await groups.getNonPrivilegeGroups('groups:createtime', 0, -1);
groupsData.sort((a, b) => b.system - a.system); groupsData.sort((a, b) => b.system - a.system);
return await app.renderAsync('admin/partials/widget-settings', { groups: groupsData }); return await webserver.app.renderAsync('admin/partials/widget-settings', { groups: groupsData });
} }
function buildTemplatesFromAreas(areas) { function buildTemplatesFromAreas(areas) {