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

Update domain::public() to only show public domains to admins, update status to be consistent with domain::public()

Browse Source
This commit is contained in:
Deon George 2023-11-25 00:10:21 +11:00
parent 82cee02fa8
commit a13497df5f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/HomeController.php
View File

@ -292,6 +292,7 @@ class HomeController extends Controller
->where('addresses.active',TRUE) ->where('addresses.active',TRUE)
->where('zones.active',TRUE) ->where('zones.active',TRUE)
->where('domains.active',TRUE) ->where('domains.active',TRUE)
->when(! ($x=Auth::user()) || (! $x->isAdmin()),function($query) { return $query->where('domains.public',TRUE); })
->join('addresses',['addresses.id'=>'a.id']) ->join('addresses',['addresses.id'=>'a.id'])
->join('zones',['zones.id'=>'addresses.zone_id']) ->join('zones',['zones.id'=>'addresses.zone_id'])
->join('domains',['domains.id'=>'zones.domain_id']) ->join('domains',['domains.id'=>'zones.domain_id'])

6
app/Models/Domain.php
View File

@ -7,6 +7,7 @@ use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use App\Casts\CompressedString; use App\Casts\CompressedString;
@ -30,7 +31,10 @@ class Domain extends Model
*/ */
public function scopePublic($query) public function scopePublic($query)
{ {
return $query->where('public',TRUE); $user = Auth::user();
return $query
->when(((! $user) || (! $user->isAdmin())),function($query) { return $query->where('public',TRUE)->active(); });
} }
/* RELATIONS */ /* RELATIONS */