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: custom navigation item not showing groups

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-11-12 17:09:58 -05:00
parent a57d94194f
commit d9452bf3d4
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'benchpress', 'j
function drop(ev, ui) { function drop(ev, ui) {
var id = ui.helper.attr('data-id'); var id = ui.helper.attr('data-id');
var el = $('#active-navigation [data-id="' + id + '"]'); var el = $('#active-navigation [data-id="' + id + '"]');
var data = id === 'custom' ? { iconClass: 'fa-navicon' } : available[id]; var data = id === 'custom' ? { iconClass: 'fa-navicon', groups: available[0].groups } : available[id];
data.enabled = false; data.enabled = false;
data.index = (parseInt($('#enabled').children().last().attr('data-index'), 10) || 0) + 1; data.index = (parseInt($('#enabled').children().last().attr('data-index'), 10) || 0) + 1;

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

@@ -17,17 +17,23 @@ navigationController.get = function (req, res, next) {
}, next); }, next);
}, },
function (result) { function (result) {
result.groups.sort((a, b) => b.system - a.system);
result.groups = result.groups.map(group => ({ name: group.name, displayName: group.displayName }));
result.admin.enabled.forEach(function (enabled, index) { result.admin.enabled.forEach(function (enabled, index) {
enabled.index = index; enabled.index = index;
enabled.selected = index === 0; enabled.selected = index === 0;
const groupData = _.cloneDeep(result.groups);
enabled.groups = groupData.map(function (group) { enabled.groups = result.groups.map(function (group) {
group.selected = enabled.groups.includes(group.name); return {
return group; displayName: group.displayName,
selected: enabled.groups.includes(group.name),
};
});
}); });
enabled.groups.sort((a, b) => b.system - a.system); result.admin.available.forEach(function (available) {
available.groups = result.groups;
}); });
result.admin.navigation = result.admin.enabled.slice(); result.admin.navigation = result.admin.enabled.slice();