dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Andras Bacsai
2023-06-22 20:52:49 +02:00
parent daec4ac9b6
commit 7ce1dc0d48
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/PrivateKey.php
View File

@@ -15,7 +15,7 @@ class PrivateKey extends BaseModel
static public function ownedByCurrentTeam(array $select = ['*']) static public function ownedByCurrentTeam(array $select = ['*'])
{ {
$selectArray = collect($select)->concat(['id']); $selectArray = collect($select)->concat(['id']);
return PrivateKey::whereTeamId(session('currentTeam')->id)->where('id', '>', 0)->select($selectArray->all()); return PrivateKey::whereTeamId(session('currentTeam')->id)->select($selectArray->all());
} }
public function applications() public function applications()
{ {

2
config/version.php
View File

@@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.2'; return '4.0.0-beta.3';

2
resources/css/app.css
View File

@@ -25,7 +25,7 @@ input[type="checkbox"] {
} }
textarea { textarea {
@apply textarea placeholder:text-neutral-700 text-white rounded scrollbar bg-coolgray-200 leading-5 text-xs; @apply textarea read-only:bg-coolgray-200/50 disabled:border-none read-only:text-opacity-25 placeholder:text-neutral-700 text-white rounded scrollbar bg-coolgray-200 leading-5 text-xs;
} }
select { select {
@apply h-7 select select-xs disabled:bg-coolgray-200 border-none disabled:opacity-50 font-normal placeholder:text-neutral-700 text-white rounded bg-coolgray-200; @apply h-7 select select-xs disabled:bg-coolgray-200 border-none disabled:opacity-50 font-normal placeholder:text-neutral-700 text-white rounded bg-coolgray-200;

20
resources/views/livewire/private-key/change.blade.php
View File

@@ -4,12 +4,14 @@
<form class="flex flex-col gap-2" wire:submit.prevent='changePrivateKey'> <form class="flex flex-col gap-2" wire:submit.prevent='changePrivateKey'>
<div class="flex items-end gap-2"> <div class="flex items-end gap-2">
<h1>Private Key</h1> <h1>Private Key</h1>
<x-forms.button type="submit"> @if ($private_key->id > 0)
Save <x-forms.button type="submit">
</x-forms.button> Save
<x-forms.button x-on:click.prevent="deletePrivateKey = true"> </x-forms.button>
Delete <x-forms.button x-on:click.prevent="deletePrivateKey = true">
</x-forms.button> Delete
</x-forms.button>
@endif
</div> </div>
<div class="pb-8">Private Key used for SSH connection</div> <div class="pb-8">Private Key used for SSH connection</div>
<x-forms.input id="private_key.name" label="Name" required /> <x-forms.input id="private_key.name" label="Name" required />
@@ -36,7 +38,11 @@
disabled /> disabled />
</div> </div>
<div x-cloak x-show="showPrivateKey"> <div x-cloak x-show="showPrivateKey">
<x-forms.textarea rows="10" id="private_key.private_key" required /> @if ($private_key->id > 0)
<x-forms.textarea rows="10" id="private_key.private_key" disabled />
@else
<x-forms.textarea rows="10" id="private_key.private_key" required />
@endif
</div> </div>
</div> </div>
</form> </form>

2
versions.json
View File

@@ -4,7 +4,7 @@
"version": "3.12.32" "version": "3.12.32"
}, },
"v4": { "v4": {
"version": "4.0.0-beta.2" "version": "4.0.0-beta.3"
} }
} }
} }