From fa2f34ba3cc7e1576f724281753c7af1ce08e586 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 22 Jun 2023 14:31:23 +0200 Subject: [PATCH] wip --- app/Models/Project.php | 2 +- app/Models/Server.php | 2 +- resources/js/components/MagicBar.vue | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Models/Project.php b/app/Models/Project.php index a790b191d..073c654b6 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -24,7 +24,7 @@ class Project extends BaseModel ]; static public function ownedByCurrentTeam() { - return Project::whereTeamId(session('currentTeam')->id); + return Project::whereTeamId(session('currentTeam')->id)->orderBy('name'); } public function team() { diff --git a/app/Models/Server.php b/app/Models/Server.php index 5382f6dfd..d3fabe967 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -87,7 +87,7 @@ class Server extends BaseModel static public function ownedByCurrentTeam(array $select = ['*']) { $selectArray = collect($select)->concat(['id']); - return Server::whereTeamId(session('currentTeam')->id)->with('settings')->select($selectArray->all()); + return Server::whereTeamId(session('currentTeam')->id)->with('settings')->select($selectArray->all())->orderBy('name'); } static public function validated() diff --git a/resources/js/components/MagicBar.vue b/resources/js/components/MagicBar.vue index 7e18810f3..0626f16f1 100644 --- a/resources/js/components/MagicBar.vue +++ b/resources/js/components/MagicBar.vue @@ -307,6 +307,7 @@ const magicActions = [{ { id: 8, name: 'Create: Team', + tags: 'team,member,new,create', icon: 'team', new: true, sequence: ['main', 'redirect']