2 Commits

3 changed files with 38 additions and 1 deletions

View File

@@ -2,7 +2,8 @@
"bundle": { "bundle": {
"js/admin": { "js/admin": {
"scripts": [ "scripts": [
"uf-tweaks/js/handlebars-helpers.js" "uf-tweaks/js/handlebars-helpers.js",
"uf-tweaks/js/modal-error-handler.js"
], ],
"options": { "options": {
"sprinkle": { "sprinkle": {

View File

@@ -0,0 +1,16 @@
/**
* Default handling of UF modal error
*
* This script depends on uf-modal.js
*
* Target page: *
*/
$(document).ready(function() {
const handleModalError = function() {
$(this).ufModal('destroy');
$('body').on('renderError.ufModal', handleModalError);
}
$('body').on('renderError.ufModal', handleModalError);
});

View File

@@ -9,6 +9,7 @@
namespace UserFrosting\Sprinkle\UFTweaks\ServicesProvider; namespace UserFrosting\Sprinkle\UFTweaks\ServicesProvider;
use Illuminate\Database\Capsule\Manager as Capsule;
use Monolog\Formatter\LineFormatter; use Monolog\Formatter\LineFormatter;
use Monolog\Handler\StreamHandler; use Monolog\Handler\StreamHandler;
use Monolog\Logger; use Monolog\Logger;
@@ -150,6 +151,25 @@ class ServicesProvider
} }
); );
/*
* Check if the specified user (by user_id) has a particular permission.
*
* @param int $user_id the id of the user.
* @param int $permission_slug slug of the permission to check.
* @return bool true if the user has the permission, false otherwise.
*/
$authorizer->addCallback(
'has_permission',
function ($user_id, $permission_slug) {
return Capsule::table('role_users')
->join('permission_roles', 'role_users.role_id', '=', 'permission_roles.role_id')
->join('permissions', 'permission_roles.permission_id', '=', 'permissions.id')
->where('user_id', $user_id)
->where('slug', $permission_slug)
->count() > 0;
}
);
return $authorizer; return $authorizer;
}); });