bbs/clrghouz
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: bbs:b02c1f07a237ceef68fdf6dbded4c660f0a32cf3
Branches Tags
bbs:master
bbs:bbs
..
compare: bbs:37adb14b9e92d23cfe3090de30ec287e4a65ee17
Branches Tags
bbs:master
bbs:bbs

2 Commits
b02c1f07a2 ... 37adb14b9e

Author SHA1 Message Date
Deon George
37adb14b9e Remove deprecated Domain::managed()
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 39s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m50s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details
2024-05-29 19:20:26 +10:00
Deon George
58adb63174 Fix for when no zones have been created yet in a domain 2024-05-29 19:20:26 +10:00
1 changed files with 6 additions and 4 deletions
Show Stats Expand all files Collapse all files

10
app/Models/Domain.php
View File

@ -69,7 +69,8 @@ class Domain extends Model
public function getCanAcceptAppAttribute(): bool public function getCanAcceptAppAttribute(): bool
{ {
return our_address($this)->count() return ($x=our_address($this))
&& $x->count()
&& $this->active && $this->active
&& $this->accept_app && $this->accept_app
&& Auth::id() && Auth::id()
@ -130,9 +131,10 @@ class Domain extends Model
*/ */
public function isManaged(): bool public function isManaged(): bool
{ {
$x = our_address(); return ($x=our_address())
&& $x->pluck('zone.domain')
return $x && $x->pluck('zone.domain')->pluck('id')->contains($this->id); ->pluck('id')
->contains($this->id);
} }
/** /**