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

fix: new nav items will show group select

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-10-07 17:03:16 -04:00
parent f402d7271a
commit c5f7b66c3a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/src/admin/general/navigation.js
View File

@@ -69,6 +69,7 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'benchpress', 'j
data.index = (parseInt($('#enabled').children().last().attr('data-index'), 10) || 0) + 1; data.index = (parseInt($('#enabled').children().last().attr('data-index'), 10) || 0) + 1;
data.title = translator.escape(data.title); data.title = translator.escape(data.title);
data.text = translator.escape(data.text); data.text = translator.escape(data.text);
data.groups = ajaxify.data.groups;
Benchpress.parse('admin/general/navigation', 'navigation', { navigation: [data] }, function (li) { Benchpress.parse('admin/general/navigation', 'navigation', { navigation: [data] }, function (li) {
translator.translate(li, function (li) { translator.translate(li, function (li) {
li = $(translator.unescape(li)); li = $(translator.unescape(li));

4
src/controllers/admin/navigation.js
View File

@@ -13,13 +13,13 @@ navigationController.get = async function (req, res) {
]); ]);
allGroups.sort((a, b) => b.system - a.system); allGroups.sort((a, b) => b.system - a.system);
const groupsData = allGroups.map(group => ({ name: group.name, displayName: group.displayName }));
admin.groups = allGroups.map(group => ({ name: group.name, displayName: group.displayName }));
admin.enabled.forEach(function (enabled, index) { admin.enabled.forEach(function (enabled, index) {
enabled.index = index; enabled.index = index;
enabled.selected = index === 0; enabled.selected = index === 0;
enabled.groups = groupsData.map(function (group) { enabled.groups = admin.groups.map(function (group) {
return { return {
displayName: group.displayName, displayName: group.displayName,
selected: enabled.groups.includes(group.name), selected: enabled.groups.includes(group.name),