lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-14 12:30:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring user permissions

Browse Source
This commit is contained in:
xiaomlove
2022-08-20 19:11:28 +08:00
parent 3046837576
commit b79762686a
73 changed files with 945 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Setting.php
View File

@@ -11,9 +11,9 @@ class Setting extends NexusModel
public $timestamps = true;
public static array $permissionDegeneration = [
'torrent-approval' => 'torrentmanage',
];
const PERMISSION_NO_CLASS = 100;
public static array $permissionMustHaveClass = ['defaultclass', 'staffmem'];
/**
* get setting autoload = yes with cache

10
app/Models/User.php
View File

@@ -17,8 +17,8 @@ use Laravel\Sanctum\HasApiTokens;
use Nexus\Database\NexusDB;
use Filament\Models\Contracts\FilamentUser;
use Filament\Models\Contracts\HasName;
use NexusPlugin\Permission\Models\Permission;
use NexusPlugin\Permission\Models\Role;
use NexusPlugin\Permission\Models\UserPermission;
class User extends Authenticatable implements FilamentUser, HasName
{
@@ -239,15 +239,15 @@ class User extends Authenticatable implements FilamentUser, HasName
public static function getClassName($class, $compact = false, $b_colored = false, $I18N = false)
{
$class_name = self::$classes[$class]['text'];
$class_name = self::$classes[$class]['text'] ?? '';
if ($class >= self::CLASS_VIP && $I18N) {
$class_name = nexus_trans("user.class_names.$class");
}
$class_name_color = self::$classes[$class]['text'];
$class_name_color = self::$classes[$class]['text'] ?? '';
if ($compact) {
$class_name = str_replace(" ", "",$class_name);
}
if ($b_colored) {
if ($class_name && $b_colored) {
return "<b class='" . str_replace(" ", "",$class_name_color) . "_Name'>" . $class_name . "</b>";
}
return $class_name;
@@ -476,7 +476,7 @@ class User extends Authenticatable implements FilamentUser, HasName
public function directPermissions()
{
return $this->belongsToMany(Permission::class, 'user_permissions', 'uid', 'permission_id')->withTimestamps();
return $this->hasMany(UserPermission::class, 'uid');
}
public function getAvatarAttribute($value)