diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php index d2a5c38358f3afe33bd0ee4f16c7ff60daf0335d..68fca554cfdb1b4a8adf2471d50c53a436ca5128 100644 --- a/include/staff/staffmembers.inc.php +++ b/include/staff/staffmembers.inc.php @@ -122,10 +122,10 @@ $agents->limit($pageNav->getLimit())->offset($pageNav->getStart()); </span> <div id="action-dropdown-more" class="action-dropdown anchor-right"> <ul id="actions"> - <li><a class="confirm" data-name="enable" href="staff.php?a=enable"> + <li><a class="confirm" data-form-id="mass-actions" data-name="enable" href="staff.php?a=enable"> <i class="icon-ok-sign icon-fixed-width"></i> <?php echo __('Enable'); ?></a></li> - <li><a class="confirm" data-name="disable" href="staff.php?a=disable"> + <li><a class="confirm" data-form-id="mass-actions" data-name="disable" href="staff.php?a=disable"> <i class="icon-ban-circle icon-fixed-width"></i> <?php echo __('Disable'); ?></a></li> <li><a class="dialog-first" data-action="permissions" href="#staff/reset-permissions"> @@ -139,7 +139,7 @@ $agents->limit($pageNav->getLimit())->offset($pageNav->getStart()); <i class="icon-puzzle-piece icon-fixed-width"></i> <?php echo __('Reset Access'); ?></a></li> --> - <li class="danger"><a class="confirm" data-name="delete" href="staff.php?a=delete"> + <li class="danger"><a class="confirm" data-form-id="mass-actions" data-name="delete" href="staff.php?a=delete"> <i class="icon-trash icon-fixed-width"></i> <?php echo __('Delete'); ?></a></li> </ul> diff --git a/scp/js/scp.js b/scp/js/scp.js index 2dac3978ae6e8060724840a56f0169a848307db2..fee30477431bd42982dc70250182d34af6c8f5bb 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -86,9 +86,13 @@ var scp_prep = function() { $('#actions :submit.button:not(.no-confirm), #actions .confirm').bind('click', function(e) { - var formObj = $(this).closest('form'), + var formObj, name = this.name || $(this).data('name'); - if($('.dialog#confirm-action p#'+name+'-confirm').length == 0) { + if ($(this).data('formId')) + formObj = $('#' + $(this).data('formId')); + else + formObj = $(this).closest('form'); + if($('.dialog#confirm-action p#'+name+'-confirm').length === 0) { alert('Unknown action '+name+' - get technical help.'); } else if(checkbox_checker(formObj, 1)) { var action = name;