|
|
|
'use strict';
|
|
|
|
|
|
|
|
define('admin/manage/privileges', [
|
|
|
|
'api',
|
|
|
|
'autocomplete',
|
|
|
|
'bootbox',
|
|
|
|
'translator',
|
|
|
|
'categorySelector',
|
|
|
|
'mousetrap',
|
|
|
|
'admin/modules/checkboxRowSelector',
|
|
|
|
], function (api, autocomplete, bootbox, translator, categorySelector, mousetrap, checkboxRowSelector) {
|
|
|
|
var Privileges = {};
|
|
|
|
|
|
|
|
var cid;
|
|
|
|
|
|
|
|
Privileges.init = function () {
|
|
|
|
cid = isNaN(parseInt(ajaxify.data.selectedCategory.cid, 10)) ? 'admin' : ajaxify.data.selectedCategory.cid;
|
|
|
|
|
|
|
|
checkboxRowSelector.init('.privilege-table-container');
|
|
|
|
|
|
|
|
categorySelector.init($('[component="category-selector"]'), {
|
|
|
|
onSelect: function (category) {
|
|
|
|
cid = parseInt(category.cid, 10);
|
|
|
|
cid = isNaN(cid) ? 'admin' : cid;
|
|
|
|
Privileges.refreshPrivilegeTable();
|
|
|
|
ajaxify.updateHistory('admin/manage/privileges/' + (cid || ''));
|
|
|
|
},
|
|
|
|
localCategories: ajaxify.data.categories,
|
|
|
|
privilege: 'find',
|
|
|
|
showLinks: true,
|
|
|
|
});
|
|
|
|
|
|
|
|
Privileges.setupPrivilegeTable();
|
|
|
|
|
|
|
|
highlightRow();
|
|
|
|
};
|
|
|
|
|
|
|
|
Privileges.setupPrivilegeTable = function () {
|
|
|
|
$('.privilege-table-container').on('change', 'input[type="checkbox"]:not(.checkbox-helper)', function () {
|
|
|
|
var checkboxEl = $(this);
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
var wrapperEl = checkboxEl.parent();
|
|
|
|
var privilege = wrapperEl.attr('data-privilege');
|
|
|
|
var state = checkboxEl.prop('checked');
|
|
|
|
var rowEl = checkboxEl.parents('tr');
|
|
|
|
var member = rowEl.attr('data-group-name') || rowEl.attr('data-uid');
|
|
|
|
var isPrivate = parseInt(rowEl.attr('data-private') || 0, 10);
|
|
|
|
var isGroup = rowEl.attr('data-group-name') !== undefined;
|
|
|
|
var isBanned = (isGroup && rowEl.attr('data-group-name') === 'banned-users') || rowEl.attr('data-banned') !== undefined;
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
var delta = checkboxEl.prop('checked') === (wrapperEl.attr('data-value') === 'true') ? null : state;
|
|
|
|
|
|
|
|
if (member) {
|
|
|
|
if (isGroup && privilege === 'groups:moderate' && !isPrivate && state) {
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
bootbox.confirm('[[admin/manage/privileges:alert.confirm-moderate]]', function (confirm) {
|
|
|
|
if (confirm) {
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
wrapperEl.attr('data-delta', delta);
|
|
|
|
Privileges.exposeAssumedPrivileges(isBanned);
|
|
|
|
} else {
|
|
|
|
checkboxEl.prop('checked', !checkboxEl.prop('checked'));
|
|
|
|
}
|
|
|
|
});
|
|
|
|
} else if (privilege.endsWith('admin:admins-mods') && state) {
|
|
|
|
bootbox.confirm('[[admin/manage/privileges:alert.confirm-admins-mods]]', function (confirm) {
|
|
|
|
if (confirm) {
|
|
|
|
wrapperEl.attr('data-delta', delta);
|
|
|
|
Privileges.exposeAssumedPrivileges();
|
|
|
|
} else {
|
|
|
|
checkboxEl.prop('checked', !checkboxEl.prop('checked'));
|
|
|
|
}
|
|
|
|
});
|
|
|
|
} else {
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
wrapperEl.attr('data-delta', delta);
|
|
|
|
Privileges.exposeAssumedPrivileges(isBanned);
|
|
|
|
}
|
|
|
|
checkboxRowSelector.updateState(checkboxEl);
|
|
|
|
} else {
|
|
|
|
app.alertError('[[error:invalid-data]]');
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
Privileges.exposeAssumedPrivileges();
|
|
|
|
checkboxRowSelector.updateAll();
|
|
|
|
Privileges.addEvents(); // events with confirmation modals
|
|
|
|
};
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
|
|
|
|
Privileges.addEvents = function () {
|
|
|
|
document.getElementById('save').addEventListener('click', function () {
|
|
|
|
throwConfirmModal('save', Privileges.commit);
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
});
|
|
|
|
|
|
|
|
document.getElementById('discard').addEventListener('click', function () {
|
|
|
|
throwConfirmModal('discard', Privileges.discard);
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
});
|
|
|
|
|
|
|
|
// Expose discard button as necessary
|
|
|
|
const containerEl = document.querySelector('.privilege-table-container');
|
|
|
|
containerEl.addEventListener('change', (e) => {
|
|
|
|
const subselector = e.target.closest('td[data-privilege] input');
|
|
|
|
if (subselector) {
|
|
|
|
document.getElementById('discard').style.display = containerEl.querySelectorAll('td[data-delta]').length ? 'unset' : 'none';
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
$('.privilege-table-container').on('click', '[data-action="search.user"]', Privileges.addUserToPrivilegeTable);
|
|
|
|
$('.privilege-table-container').on('click', '[data-action="search.group"]', Privileges.addGroupToPrivilegeTable);
|
|
|
|
$('.privilege-table-container').on('click', '[data-action="copyToChildren"]', function () {
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
throwConfirmModal('copyToChildren', Privileges.copyPrivilegesToChildren.bind(null, cid, ''));
|
|
|
|
});
|
|
|
|
$('.privilege-table-container').on('click', '[data-action="copyToChildrenGroup"]', function () {
|
|
|
|
var groupName = $(this).parents('[data-group-name]').attr('data-group-name');
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
throwConfirmModal('copyToChildrenGroup', Privileges.copyPrivilegesToChildren.bind(null, cid, groupName));
|
|
|
|
});
|
|
|
|
|
|
|
|
$('.privilege-table-container').on('click', '[data-action="copyPrivilegesFrom"]', function () {
|
|
|
|
Privileges.copyPrivilegesFromCategory(cid, '');
|
|
|
|
});
|
|
|
|
$('.privilege-table-container').on('click', '[data-action="copyPrivilegesFromGroup"]', function () {
|
|
|
|
var groupName = $(this).parents('[data-group-name]').attr('data-group-name');
|
|
|
|
Privileges.copyPrivilegesFromCategory(cid, groupName);
|
|
|
|
});
|
|
|
|
|
|
|
|
$('.privilege-table-container').on('click', '[data-action="copyToAll"]', function () {
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
throwConfirmModal('copyToAll', Privileges.copyPrivilegesToAllCategories.bind(null, cid, ''));
|
|
|
|
});
|
|
|
|
$('.privilege-table-container').on('click', '[data-action="copyToAllGroup"]', function () {
|
|
|
|
var groupName = $(this).parents('[data-group-name]').attr('data-group-name');
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
throwConfirmModal('copyToAllGroup', Privileges.copyPrivilegesToAllCategories.bind(null, cid, groupName));
|
|
|
|
});
|
|
|
|
|
|
|
|
mousetrap.bind('ctrl+s', function (ev) {
|
|
|
|
throwConfirmModal('save', Privileges.commit);
|
|
|
|
ev.preventDefault();
|
|
|
|
});
|
|
|
|
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
function throwConfirmModal(method, onConfirm) {
|
|
|
|
bootbox.confirm('[[admin/manage/privileges:alert.confirm-' + method + ']]<br /><br />[[admin/manage/privileges:alert.no-undo]]', function (ok) {
|
|
|
|
if (ok) {
|
|
|
|
onConfirm.call();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
};
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
|
|
|
|
Privileges.commit = function () {
|
|
|
|
var tableEl = document.querySelector('.privilege-table-container');
|
|
|
|
var requests = $.map(tableEl.querySelectorAll('td[data-delta]'), function (el) {
|
|
|
|
var privilege = el.getAttribute('data-privilege');
|
|
|
|
var rowEl = el.parentNode;
|
|
|
|
var member = rowEl.getAttribute('data-group-name') || rowEl.getAttribute('data-uid');
|
|
|
|
var state = el.getAttribute('data-delta') === 'true' ? 1 : 0;
|
|
|
|
|
|
|
|
return Privileges.setPrivilege(member, privilege, state);
|
|
|
|
});
|
|
|
|
|
|
|
|
Promise.allSettled(requests).then((results) => {
|
|
|
|
Privileges.refreshPrivilegeTable();
|
|
|
|
|
|
|
|
const rejects = results.filter(r => r.status === 'rejected');
|
|
|
|
if (rejects.length) {
|
|
|
|
rejects.forEach((result) => {
|
|
|
|
app.alertError(result.reason);
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
app.alertSuccess('[[admin/manage/privileges:alert.saved]]');
|
|
|
|
}
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
Privileges.discard = function () {
|
|
|
|
Privileges.refreshPrivilegeTable();
|
|
|
|
app.alertSuccess('[[admin/manage/privileges:alert.discarded]]');
|
|
|
|
};
|
|
|
|
|
|
|
|
Privileges.refreshPrivilegeTable = function (groupToHighlight) {
|
|
|
|
api.get(`/categories/${cid}/privileges`, {}).then((privileges) => {
|
|
|
|
ajaxify.data.privileges = { ...ajaxify.data.privileges, ...privileges };
|
|
|
|
var tpl = parseInt(cid, 10) ? 'admin/partials/privileges/category' : 'admin/partials/privileges/global';
|
|
|
|
Promise.all([
|
|
|
|
app.parseAndTranslate(tpl, 'privileges.groups', { privileges }),
|
|
|
|
app.parseAndTranslate(tpl, 'privileges.users', { privileges }),
|
|
|
|
]).then((html) => {
|
|
|
|
$('.privilege-table-container tbody').first().html(html[0]);
|
|
|
|
$('.privilege-table-container tbody').last().html(html[1]);
|
|
|
|
Privileges.exposeAssumedPrivileges();
|
|
|
|
checkboxRowSelector.updateAll();
|
|
|
|
|
|
|
|
hightlightRowByDataAttr('data-group-name', groupToHighlight);
|
|
|
|
});
|
|
|
|
}).catch(app.alertError);
|
|
|
|
};
|
|
|
|
|
|
|
|
Privileges.exposeAssumedPrivileges = function (isBanned) {
|
|
|
|
/*
|
|
|
|
If registered-users has a privilege enabled, then all users and groups of that privilege
|
|
|
|
should be assumed to have that privilege as well, even if not set in the db, so reflect
|
|
|
|
this arrangement in the table
|
|
|
|
*/
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
|
|
|
|
// As such, individual banned users inherits privileges from banned-users group
|
|
|
|
// Running this block only when needed
|
|
|
|
if (isBanned === undefined || isBanned === true) {
|
|
|
|
const getBannedUsersInputSelector = (privs, i) => `.privilege-table tr[data-banned] td[data-privilege="${privs[i]}"] input`;
|
|
|
|
const bannedUsersPrivs = getPrivilegesFromRow('banned-users');
|
|
|
|
applyPrivileges(bannedUsersPrivs, getBannedUsersInputSelector);
|
|
|
|
if (isBanned === true) {
|
|
|
|
return;
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const getRegisteredUsersInputSelector = (privs, i) => `.privilege-table tr[data-group-name]:not([data-group-name="registered-users"],[data-group-name="banned-users"],[data-group-name="guests"],[data-group-name="spiders"]) td[data-privilege="${privs[i]}"] input, .privilege-table tr[data-uid]:not([data-banned]) td[data-privilege="${privs[i]}"] input`;
|
|
|
|
const registeredUsersPrivs = getPrivilegesFromRow('registered-users');
|
|
|
|
applyPrivileges(registeredUsersPrivs, getRegisteredUsersInputSelector);
|
|
|
|
};
|
|
|
|
|
|
|
|
Privileges.setPrivilege = (member, privilege, state) => api[state ? 'put' : 'delete'](`/categories/${isNaN(cid) ? 0 : cid}/privileges/${privilege}`, { member });
|
|
|
|
|
|
|
|
Privileges.addUserToPrivilegeTable = function () {
|
|
|
|
var modal = bootbox.dialog({
|
|
|
|
title: '[[admin/manage/categories:alert.find-user]]',
|
|
|
|
message: '<input class="form-control input-lg" placeholder="[[admin/manage/categories:alert.user-search]]" />',
|
|
|
|
show: true,
|
|
|
|
});
|
|
|
|
|
|
|
|
modal.on('shown.bs.modal', function () {
|
|
|
|
var inputEl = modal.find('input');
|
|
|
|
inputEl.focus();
|
|
|
|
|
|
|
|
autocomplete.user(inputEl, function (ev, ui) {
|
|
|
|
addUserToCategory(ui.item.user, function () {
|
|
|
|
modal.modal('hide');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
Privileges.addGroupToPrivilegeTable = function () {
|
|
|
|
var modal = bootbox.dialog({
|
|
|
|
title: '[[admin/manage/categories:alert.find-group]]',
|
|
|
|
message: '<input class="form-control input-lg" placeholder="[[admin/manage/categories:alert.group-search]]" />',
|
|
|
|
show: true,
|
|
|
|
});
|
|
|
|
|
|
|
|
modal.on('shown.bs.modal', function () {
|
|
|
|
var inputEl = modal.find('input');
|
|
|
|
inputEl.focus();
|
|
|
|
|
|
|
|
autocomplete.group(inputEl, function (ev, ui) {
|
|
|
|
if (ui.item.group.name === 'administrators') {
|
|
|
|
return app.alert({
|
|
|
|
type: 'warning',
|
|
|
|
message: '[[admin/manage/privileges:alert.admin-warning]]',
|
|
|
|
});
|
|
|
|
}
|
|
|
|
addGroupToCategory(ui.item.group.name, function () {
|
|
|
|
modal.modal('hide');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
Privileges.copyPrivilegesToChildren = function (cid, group) {
|
|
|
|
socket.emit('admin.categories.copyPrivilegesToChildren', { cid: cid, group: group }, function (err) {
|
|
|
|
if (err) {
|
|
|
|
return app.alertError(err.message);
|
|
|
|
}
|
|
|
|
app.alertSuccess('[[admin/manage/categories:privileges.copy-success]]');
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
Privileges.copyPrivilegesFromCategory = function (cid, group) {
|
|
|
|
categorySelector.modal({
|
|
|
|
localCategories: [],
|
|
|
|
showLinks: true,
|
|
|
|
onSubmit: function (selectedCategory) {
|
|
|
|
socket.emit('admin.categories.copyPrivilegesFrom', {
|
|
|
|
toCid: cid,
|
|
|
|
fromCid: selectedCategory.cid,
|
|
|
|
group: group,
|
|
|
|
}, function (err) {
|
|
|
|
if (err) {
|
|
|
|
return app.alertError(err.message);
|
|
|
|
}
|
|
|
|
ajaxify.refresh();
|
|
|
|
});
|
|
|
|
},
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
Privileges.copyPrivilegesToAllCategories = function (cid, group) {
|
|
|
|
socket.emit('admin.categories.copyPrivilegesToAllCategories', { cid: cid, group: group }, function (err) {
|
|
|
|
if (err) {
|
|
|
|
return app.alertError(err.message);
|
|
|
|
}
|
|
|
|
app.alertSuccess('[[admin/manage/categories:privileges.copy-success]]');
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
function getPrivilegesFromRow(sourceGroupName) {
|
|
|
|
const privs = [];
|
|
|
|
$(`.privilege-table tr[data-group-name="${sourceGroupName}"] td input[type="checkbox"]:not(.checkbox-helper)`)
|
|
|
|
.parent()
|
|
|
|
.each(function (idx, el) {
|
|
|
|
if ($(el).find('input').prop('checked')) {
|
|
|
|
privs.push(el.getAttribute('data-privilege'));
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// Also apply to non-group privileges
|
|
|
|
return privs.concat(privs.map(function (priv) {
|
|
|
|
if (priv.startsWith('groups:')) {
|
|
|
|
return priv.slice(7);
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
})).filter(Boolean);
|
|
|
|
}
|
|
|
|
|
|
|
|
function applyPrivileges(privs, inputSelectorFn) {
|
|
|
|
for (let x = 0, numPrivs = privs.length; x < numPrivs; x += 1) {
|
|
|
|
const inputs = $(inputSelectorFn(privs, x));
|
|
|
|
inputs.each(function (idx, el) {
|
|
|
|
if (!el.checked) {
|
|
|
|
el.indeterminate = true;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function hightlightRowByDataAttr(attrName, attrValue) {
|
|
|
|
if (attrValue) {
|
|
|
|
var el = $('[' + attrName + ']').filter(function () {
|
|
|
|
return $(this).attr(attrName) === String(attrValue);
|
|
|
|
});
|
|
|
|
|
|
|
|
if (el.length) {
|
|
|
|
el.addClass('selected');
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
function highlightRow() {
|
|
|
|
if (ajaxify.data.group) {
|
|
|
|
if (hightlightRowByDataAttr('data-group-name', ajaxify.data.group)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
addGroupToCategory(ajaxify.data.group);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function addGroupToCategory(group, cb) {
|
|
|
|
cb = cb || function () {};
|
|
|
|
var groupRow = document.querySelector('.privilege-table [data-group-name="' + group + '"]');
|
|
|
|
if (groupRow) {
|
|
|
|
hightlightRowByDataAttr('data-group-name', group);
|
|
|
|
return cb();
|
|
|
|
}
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
// Generate data for new row
|
|
|
|
var privilegeSet = ajaxify.data.privileges.keys.groups.reduce(function (memo, cur) {
|
|
|
|
memo[cur] = false;
|
|
|
|
return memo;
|
|
|
|
}, {});
|
|
|
|
|
|
|
|
app.parseAndTranslate('admin/partials/privileges/' + ((isNaN(cid) || cid === 0) ? 'global' : 'category'), 'privileges.groups', {
|
|
|
|
privileges: {
|
|
|
|
groups: [
|
|
|
|
{
|
|
|
|
name: group,
|
|
|
|
nameEscaped: translator.escape(group),
|
|
|
|
privileges: privilegeSet,
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
|
|
|
}, function (html) {
|
|
|
|
var tbodyEl = document.querySelector('.privilege-table tbody');
|
|
|
|
tbodyEl.append(html.get(0));
|
feat: more discrete commit-on-save instead of commit-on-change w/ confirm modals (#8541)
* feat: privileges save button, #8537, WIP
* fix: disable firefox autocomplete on privilege form fields
* feat: closes #8537 privilege changes commit on save
- new language strings for confirmation and success modals/toasts
- indeterminate privilege handling (/cc @psychobunny)
- added new discard button
- both discard and save buttons now have confirmation dialogs
* fix(tests): remove duplicate template helper test
* fix(tests): broken template helper test
* feat: confirm dialogs for all privilege copy actions
Also, ability to add user to a privilege table without needing
to refresh the privilege table.
* feat: group row addition w/o table refresh
breaking: helpers.getUserPrivileges and helpers.getGroupPrivileges
no longer make socket calls to the following hooks:
- filter:privileges.list, filter:privileges.admin.list,
filter:privileges.global.list, filter:privileges.groups.list,
filter:privileges.admin.groups.list,
filter:privileges.gloval.groups.list
The filters are still called, but done before the helper method
is called, and the results are passed in instead. This change
should only affect you if you directly call the helper methods,
otherwise the change is transparent.
* fix: stale ajaxify data on privilege category switch
* fix: implicit privileges not showing for user privs
* fix: groups, not group, also fix tests
* fix(tests): again
* fix: wrong tpl rendered when adding group to global priv table
5 years ago
|
|
|
Privileges.exposeAssumedPrivileges();
|
|
|
|
hightlightRowByDataAttr('data-group-name', group);
|
|
|
|
cb();
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
async function addUserToCategory(user, cb) {
|
|
|
|
cb = cb || function () {};
|
|
|
|
var userRow = document.querySelector('.privilege-table [data-uid="' + user.uid + '"]');
|
|
|
|
if (userRow) {
|
|
|
|
hightlightRowByDataAttr('data-uid', user.uid);
|
|
|
|
return cb();
|
|
|
|
}
|
|
|
|
// Generate data for new row
|
|
|
|
var privilegeSet = ajaxify.data.privileges.keys.users.reduce(function (memo, cur) {
|
|
|
|
memo[cur] = false;
|
|
|
|
return memo;
|
|
|
|
}, {});
|
|
|
|
|
|
|
|
const html = await app.parseAndTranslate('admin/partials/privileges/' + (isNaN(cid) ? 'global' : 'category'), 'privileges.users', {
|
|
|
|
privileges: {
|
|
|
|
users: [
|
|
|
|
{
|
|
|
|
picture: user.picture,
|
|
|
|
username: user.username,
|
|
|
|
banned: user.banned,
|
|
|
|
uid: user.uid,
|
|
|
|
'icon:text': user['icon:text'],
|
|
|
|
'icon:bgColor': user['icon:bgColor'],
|
|
|
|
privileges: privilegeSet,
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
|
|
|
});
|
|
|
|
|
|
|
|
var tbodyEl = document.querySelectorAll('.privilege-table tbody');
|
|
|
|
tbodyEl[1].append(html.get(0));
|
|
|
|
Privileges.exposeAssumedPrivileges();
|
|
|
|
hightlightRowByDataAttr('data-uid', user.uid);
|
|
|
|
cb();
|
|
|
|
}
|
|
|
|
|
|
|
|
return Privileges;
|
|
|
|
});
|