Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-26 08:31:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: headers for global privs #9717 (#9762)

Browse Source 
* feat: headers for global privs #9717

* fix: don't spoil headers to adminPrivs

Co-authored-by: Julian Lam <julian@nodebb.org>
This commit is contained in:
gasoved
2021-09-09 00:17:25 +03:00
committed by GitHub
parent ee02771959
commit 84ff1152f7
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/admin/manage/privileges.js
View File

@@ -183,7 +183,8 @@ define('admin/manage/privileges', [
api.get(`/categories/${cid}/privileges`, {}).then((privileges) => { api.get(`/categories/${cid}/privileges`, {}).then((privileges) => {
ajaxify.data.privileges = { ...ajaxify.data.privileges, ...privileges }; ajaxify.data.privileges = { ...ajaxify.data.privileges, ...privileges };
const tpl = parseInt(cid, 10) ? 'admin/partials/privileges/category' : 'admin/partials/privileges/global'; const tpl = parseInt(cid, 10) ? 'admin/partials/privileges/category' : 'admin/partials/privileges/global';
app.parseAndTranslate(tpl, { privileges }).then((html) => { const isAdminPriv = ajaxify.currentPage.endsWith('admin/manage/privileges/admin');
app.parseAndTranslate(tpl, { privileges, isAdminPriv }).then((html) => {
// Get currently selected filters // Get currently selected filters
const btnIndices = $('.privilege-filters button.btn-warning').map((idx, el) => $(el).index()).get(); const btnIndices = $('.privilege-filters button.btn-warning').map((idx, el) => $(el).index()).get();
$('.privilege-table-container').html(html); $('.privilege-table-container').html(html);

7
src/controllers/admin/privileges.js
View File

@@ -44,8 +44,9 @@ privilegesController.get = async function (req, res) {
res.render('admin/manage/privileges', { res.render('admin/manage/privileges', {
privileges: privilegesData, privileges: privilegesData,
categories: categoriesData, categories: categoriesData,
selectedCategory: selectedCategory, selectedCategory,
cid: cid, cid,
group: group, group,
isAdminPriv,
}); });
}; };

8
src/privileges/global.js
View File

@@ -16,8 +16,8 @@ privsGlobal.privilegeLabels = [
{ name: '[[admin/manage/privileges:upload-images]]' }, { name: '[[admin/manage/privileges:upload-images]]' },
{ name: '[[admin/manage/privileges:upload-files]]' }, { name: '[[admin/manage/privileges:upload-files]]' },
{ name: '[[admin/manage/privileges:signature]]' }, { name: '[[admin/manage/privileges:signature]]' },
{ name: '[[admin/manage/privileges:ban]]' },
{ name: '[[admin/manage/privileges:invite]]' }, { name: '[[admin/manage/privileges:invite]]' },
{ name: '[[admin/manage/privileges:allow-group-creation]]' },
{ name: '[[admin/manage/privileges:search-content]]' }, { name: '[[admin/manage/privileges:search-content]]' },
{ name: '[[admin/manage/privileges:search-users]]' }, { name: '[[admin/manage/privileges:search-users]]' },
{ name: '[[admin/manage/privileges:search-tags]]' }, { name: '[[admin/manage/privileges:search-tags]]' },
@@ -25,7 +25,7 @@ privsGlobal.privilegeLabels = [
{ name: '[[admin/manage/privileges:view-tags]]' }, { name: '[[admin/manage/privileges:view-tags]]' },
{ name: '[[admin/manage/privileges:view-groups]]' }, { name: '[[admin/manage/privileges:view-groups]]' },
{ name: '[[admin/manage/privileges:allow-local-login]]' }, { name: '[[admin/manage/privileges:allow-local-login]]' },
{ name: '[[admin/manage/privileges:allow-group-creation]]' }, { name: '[[admin/manage/privileges:ban]]' },
{ name: '[[admin/manage/privileges:view-users-info]]' }, { name: '[[admin/manage/privileges:view-users-info]]' },
]; ];
@@ -34,8 +34,8 @@ privsGlobal.userPrivilegeList = [
'upload:post:image', 'upload:post:image',
'upload:post:file', 'upload:post:file',
'signature', 'signature',
'ban',
'invite', 'invite',
'group:create',
'search:content', 'search:content',
'search:users', 'search:users',
'search:tags', 'search:tags',
@@ -43,7 +43,7 @@ privsGlobal.userPrivilegeList = [
'view:tags', 'view:tags',
'view:groups', 'view:groups',
'local:login', 'local:login',
'group:create', 'ban',
'view:users:info', 'view:users:info',
]; ];

14
src/views/admin/partials/privileges/global.tpl
View File

@@ -1,6 +1,20 @@
<label>[[admin/manage/privileges:group-privileges]]</label> <label>[[admin/manage/privileges:group-privileges]]</label>
<table class="table table-striped privilege-table"> <table class="table table-striped privilege-table">
<thead> <thead>
{{{ if !isAdminPriv }}}
<tr class="privilege-table-header">
<th colspan="3"></th>
<th class="arrowed" colspan="6">
[[admin/manage/categories:privileges.section-posting]]
</th>
<th class="arrowed" colspan="7">
[[admin/manage/categories:privileges.section-viewing]]
</th>
<th class="arrowed" colspan="2">
[[admin/manage/categories:privileges.section-moderation]]
</th>
</tr><tr><!-- zebrastripe reset --></tr>
{{{ end }}}
<tr> <tr>
<th colspan="2">[[admin/manage/categories:privileges.section-group]]</th> <th colspan="2">[[admin/manage/categories:privileges.section-group]]</th>
<th class="text-center">[[admin/manage/privileges:select-clear-all]]</th> <th class="text-center">[[admin/manage/privileges:select-clear-all]]</th>