STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 3 Actions Packages Projects Releases 3 Wiki Activity

added tests, bug fixes and cleanup

Browse Source
This commit is contained in:
James Collins
2023-03-13 16:03:32 +10:00
parent 44b123307a
commit 2cea90c2c8
21 changed files with 443 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Conductors/EventConductor.php
View File

@@ -30,7 +30,7 @@ class EventConductor extends Conductor
public function scope(Builder $builder)
{
$user = auth()->user();
if ($user === null || $user->has_permission('admin/events') === false) {
if ($user === null || $user->hasPermission('admin/events') === false) {
$builder
->where('status', '!=', 'draft')
->where('publish_at', '<=', now());
@@ -47,7 +47,7 @@ class EventConductor extends Conductor
{
if (strtolower($model->status) === 'draft' || Carbon::parse($model->publish_at)->isFuture() === true) {
$user = auth()->user();
if ($user === null || $user->has_permission('admin/events') === false) {
if ($user === null || $user->hasPermission('admin/events') === false) {
return false;
}
}
@@ -63,7 +63,7 @@ class EventConductor extends Conductor
public static function creatable()
{
$user = auth()->user();
return ($user !== null && $user->has_permission('admin/events') === true);
return ($user !== null && $user->hasPermission('admin/events') === true);
}
/**
@@ -75,18 +75,18 @@ class EventConductor extends Conductor
public static function updatable(Model $model)
{
$user = auth()->user();
return ($user !== null && $user->has_permission('admin/events') === true);
return ($user !== null && $user->hasPermission('admin/events') === true);
}
/**
* Return if the current model is deletable.
* Return if the current model is destroyable.
*
* @param Model $model The model.
* @return boolean Allow deleting model.
*/
public static function deletable(Model $model)
public static function destroyable(Model $model)
{
$user = auth()->user();
return ($user !== null && $user->has_permission('admin/events') === true);
return ($user !== null && $user->hasPermission('admin/events') === true);
}
}