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: #9351 bad logic when inserting rows to privilege tables, also a missing tfoot 🦶

Browse Source
This commit is contained in:
Julian Lam
2021-03-05 15:09:37 -05:00
parent c265016944
commit c5e257888a
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,16 +363,15 @@ define('admin/manage/privileges', [
], ],
}, },
}, function (html) { }, function (html) {
var tableEl = document.querySelector('.privilege-table'); var tbodyEl = document.querySelector('.privilege-table tbody');
var rows = tableEl.querySelectorAll('tbody tr'); tbodyEl.append(html.get(0));
html.insertBefore(rows[rows.length - 1]);
Privileges.exposeAssumedPrivileges(); Privileges.exposeAssumedPrivileges();
hightlightRowByDataAttr('data-group-name', group); hightlightRowByDataAttr('data-group-name', group);
cb(); cb();
}); });
} }
function addUserToCategory(user, cb) { async function addUserToCategory(user, cb) {
cb = cb || function () {}; cb = cb || function () {};
var userRow = document.querySelector('.privilege-table [data-uid="' + user.uid + '"]'); var userRow = document.querySelector('.privilege-table [data-uid="' + user.uid + '"]');
if (userRow) { if (userRow) {
@@ -385,7 +384,7 @@ define('admin/manage/privileges', [
return memo; return memo;
}, {}); }, {});
app.parseAndTranslate('admin/partials/privileges/' + (isNaN(cid) ? 'global' : 'category'), 'privileges.users', { const html = await app.parseAndTranslate('admin/partials/privileges/' + (isNaN(cid) ? 'global' : 'category'), 'privileges.users', {
privileges: { privileges: {
users: [ users: [
{ {
@@ -399,13 +398,13 @@ define('admin/manage/privileges', [
}, },
], ],
}, },
}, function (html) {
var tableEl = document.querySelectorAll('.privilege-table');
var rows = tableEl[1].querySelectorAll('tbody tr');
html.insertBefore(rows[rows.length - 1]);
hightlightRowByDataAttr('data-uid', user.uid);
cb();
}); });
var tbodyEl = document.querySelectorAll('.privilege-table tbody');
tbodyEl[1].append(html.get(0));
Privileges.exposeAssumedPrivileges();
hightlightRowByDataAttr('data-uid', user.uid);
cb();
} }
return Privileges; return Privileges;

4
src/views/admin/partials/privileges/category.tpl
View File

@@ -135,6 +135,8 @@
{function.spawnPrivilegeStates, privileges.users.username, ../privileges} {function.spawnPrivilegeStates, privileges.users.username, ../privileges}
</tr> </tr>
<!-- END privileges.users --> <!-- END privileges.users -->
</tbody>
<tfoot>
<tr> <tr>
<td colspan="{privileges.columnCountUser}"> <td colspan="{privileges.columnCountUser}">
<button type="button" class="btn btn-default pull-right" data-ajaxify="false" data-action="search.user"> <button type="button" class="btn btn-default pull-right" data-ajaxify="false" data-action="search.user">
@@ -143,5 +145,5 @@
</button> </button>
</td> </td>
</tr> </tr>
</tbody> </tfoot>
</table> </table>

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

@@ -81,6 +81,8 @@
{function.spawnPrivilegeStates, privileges.users.username, ../privileges} {function.spawnPrivilegeStates, privileges.users.username, ../privileges}
</tr> </tr>
<!-- END privileges.users --> <!-- END privileges.users -->
</tbody>
<tfoot>
<tr> <tr>
<td colspan="{privileges.columnCount}"> <td colspan="{privileges.columnCount}">
<button type="button" class="btn btn-default pull-right" data-ajaxify="false" data-action="search.user"> <button type="button" class="btn btn-default pull-right" data-ajaxify="false" data-action="search.user">
@@ -89,5 +91,5 @@
</button> </button>
</td> </td>
</tr> </tr>
</tbody> </tfoot>
</table> </table>