Removed duplicate overloaded methods in default permission seed
This commit is contained in:
@@ -19,22 +19,6 @@ use UserFrosting\Sprinkle\Core\Facades\Seeder;
|
|||||||
*/
|
*/
|
||||||
class DefaultPermissions extends UFDefaultPermissions
|
class DefaultPermissions extends UFDefaultPermissions
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* {@inheritdoc}
|
|
||||||
*/
|
|
||||||
public function run()
|
|
||||||
{
|
|
||||||
// We require the default roles
|
|
||||||
Seeder::execute('DefaultRoles');
|
|
||||||
|
|
||||||
// Get and save permissions
|
|
||||||
$permissions = $this->getPermissions();
|
|
||||||
$this->savePermissions($permissions);
|
|
||||||
|
|
||||||
// Add default mappings to permissions
|
|
||||||
$this->syncPermissionsRole($permissions);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array Permissions to seed
|
* @return array Permissions to seed
|
||||||
*/
|
*/
|
||||||
@@ -128,27 +112,6 @@ class DefaultPermissions extends UFDefaultPermissions
|
|||||||
return array_merge($basePermissions, $newPermissions);
|
return array_merge($basePermissions, $newPermissions);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Save permissions.
|
|
||||||
*
|
|
||||||
* @param array $permissions
|
|
||||||
*/
|
|
||||||
protected function savePermissions(array &$permissions)
|
|
||||||
{
|
|
||||||
foreach ($permissions as $slug => $permission) {
|
|
||||||
// Trying to find if the permission already exist
|
|
||||||
$existingPermission = Permission::where(['slug' => $permission->slug, 'conditions' => $permission->conditions])->first();
|
|
||||||
|
|
||||||
// Don't save if already exist, use existing permission reference
|
|
||||||
// otherwise to re-sync permissions and roles
|
|
||||||
if ($existingPermission == null) {
|
|
||||||
$permission->save();
|
|
||||||
} else {
|
|
||||||
$permissions[$slug] = $existingPermission;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sync permissions with default roles.
|
* Sync permissions with default roles.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user