Merge branch 'pelican-dev:main' into fix/655

pelican-dev · Oct 28, 2024 · 2cfa91a · 2cfa91a
2 parents 122f303 + 1a3dc5c
commit 2cfa91a
Show file tree

Hide file tree

Showing 64 changed files with 1,060 additions and 668 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -9,6 +9,10 @@ on:
     types:
       - published
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   build-and-push:
     name: Build and Push
@@ -26,7 +30,7 @@ jobs:
         id: docker_meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/pelican-dev/panel
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
             latest=false
           tags: |

diff --git a/app/Events/Server/Created.php b/app/Events/Server/Created.php
diff --git a/app/Events/Server/Creating.php b/app/Events/Server/Creating.php
diff --git a/app/Events/Server/Deleted.php b/app/Events/Server/Deleted.php
diff --git a/app/Events/Server/Deleting.php b/app/Events/Server/Deleting.php
diff --git a/app/Events/Server/Saved.php b/app/Events/Server/Saved.php
diff --git a/app/Events/Server/Saving.php b/app/Events/Server/Saving.php
diff --git a/app/Events/Server/Updated.php b/app/Events/Server/Updated.php
diff --git a/app/Events/Server/Updating.php b/app/Events/Server/Updating.php
diff --git a/app/Events/Subuser/Created.php b/app/Events/Subuser/Created.php
diff --git a/app/Events/Subuser/Creating.php b/app/Events/Subuser/Creating.php
diff --git a/app/Events/Subuser/Deleted.php b/app/Events/Subuser/Deleted.php
diff --git a/app/Events/Subuser/Deleting.php b/app/Events/Subuser/Deleting.php
diff --git a/app/Events/User/Created.php b/app/Events/User/Created.php
diff --git a/app/Events/User/Creating.php b/app/Events/User/Creating.php
diff --git a/app/Events/User/Deleted.php b/app/Events/User/Deleted.php
diff --git a/app/Events/User/Deleting.php b/app/Events/User/Deleting.php
diff --git a/app/Filament/Resources/ApiKeyResource.php b/app/Filament/Resources/ApiKeyResource.php
@@ -19,7 +19,7 @@ class ApiKeyResource extends Resource
 
     public static function getNavigationBadge(): ?string
     {
-        return static::getModel()::where('key_type', '2')->count() ?: null;
+        return static::getModel()::where('key_type', ApiKey::TYPE_APPLICATION)->count() ?: null;
     }
 
     public static function canEdit(Model $record): bool