Skip to content

Commit ec420bf

Browse files
committed
chore: cleanup and fixes
1 parent ecbbcec commit ec420bf

3 files changed

Lines changed: 7 additions & 12 deletions

File tree

Corals/core/Foundation/Classes/CoralsForm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public function input($key, $label = '', $required = false, $value = null, $attr
239239

240240
$input = '<div class="preDefinedDates row ">';
241241
$input .= '<div class="col-md-4">';
242-
$input .= $this->select('', '', $allowedPredefinedDates, false, $value['pre_defined_date'] ?? null, $predefinedDateAttributes, 'select2');
242+
$input .= $this->select($key . '_key', '', $allowedPredefinedDates, false, $value['pre_defined_date'] ?? null, $predefinedDateAttributes, 'select2');
243243
$input .= '</div>';
244244
$input .= '<div class="col-md-8">';
245245
$input .= $this->dateRange($key, '', false, [

Corals/core/Settings/Classes/Modules.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Illuminate\Support\Facades\Artisan;
1010
use Illuminate\Support\Facades\Cache;
1111
use Illuminate\Support\Facades\File;
12+
use Spatie\Permission\Models\Role;
1213

1314
/**
1415
* Class Modules
@@ -556,8 +557,11 @@ public function update($module)
556557

557558
public function grantSuperuserRoleFullAccess()
558559
{
559-
$role = \Corals\User\Models\Role::findByName('superuser');
560-
$role->syncPermissions(\Spatie\Permission\Models\Permission::all());
560+
$superuserRole = Role::query()->where('name', 'superuser')->first();
561+
562+
if ($superuserRole) {
563+
$superuserRole->syncPermissions(\Spatie\Permission\Models\Permission::all());
564+
}
561565
}
562566

563567
/**

app/Console/Commands/LarashipDeployment.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,6 @@ public function handle()
5555
});
5656

5757
$sortedModules = [
58-
'corals-activity',
59-
'corals-file-manager',
60-
'corals-foundation',
61-
'corals-media',
62-
'corals-menu',
63-
'corals-settings',
64-
'corals-theme',
65-
'corals-user',
66-
'corals-utility',
6758
];
6859

6960
$this->line('Update or install required modules');

0 commit comments

Comments
 (0)