chore: cleanup and fixes

coralsio · Aug 26, 2024 · ec420bf · ec420bf
1 parent ecbbcec
commit ec420bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/Corals/core/Foundation/Classes/CoralsForm.php b/Corals/core/Foundation/Classes/CoralsForm.php
@@ -239,7 +239,7 @@ public function input($key, $label = '', $required = false, $value = null, $attr
 
             $input = '<div class="preDefinedDates row ">';
             $input .= '<div class="col-md-4">';
-            $input .= $this->select('', '', $allowedPredefinedDates, false, $value['pre_defined_date'] ?? null, $predefinedDateAttributes, 'select2');
+            $input .= $this->select($key . '_key', '', $allowedPredefinedDates, false, $value['pre_defined_date'] ?? null, $predefinedDateAttributes, 'select2');
             $input .= '</div>';
             $input .= '<div class="col-md-8">';
             $input .= $this->dateRange($key, '', false, [

diff --git a/Corals/core/Settings/Classes/Modules.php b/Corals/core/Settings/Classes/Modules.php
@@ -9,6 +9,7 @@
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\File;
+use Spatie\Permission\Models\Role;
 
 /**
  * Class Modules
@@ -556,8 +557,11 @@ public function update($module)
 
     public function grantSuperuserRoleFullAccess()
     {
-        $role = \Corals\User\Models\Role::findByName('superuser');
-        $role->syncPermissions(\Spatie\Permission\Models\Permission::all());
+        $superuserRole = Role::query()->where('name', 'superuser')->first();
+
+        if ($superuserRole) {
+            $superuserRole->syncPermissions(\Spatie\Permission\Models\Permission::all());
+        }
     }
 
     /**

diff --git a/app/Console/Commands/LarashipDeployment.php b/app/Console/Commands/LarashipDeployment.php
@@ -55,15 +55,6 @@ public function handle()
         });
 
         $sortedModules = [
-            'corals-activity',
-            'corals-file-manager',
-            'corals-foundation',
-            'corals-media',
-            'corals-menu',
-            'corals-settings',
-            'corals-theme',
-            'corals-user',
-            'corals-utility',
         ];
 
         $this->line('Update or install required modules');