Internal enhancements to system registration and editing

app/Models/System.php

@@ -4,17 +4,34 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
 
 use App\Http\Controllers\DomainController;
-use App\Traits\ScopeActive;
-use Illuminate\Support\Collection;
 
 class System extends Model
 {
-	use HasFactory,ScopeActive;
+	use HasFactory;
 
 	protected $dates = ['last_session'];
 
+	/* SCOPES */
+
+	/**
+	 * Only query active records
+	 */
+	public function scopeActive($query)
+	{
+		$uo = Auth::user();
+
+		return $query
+			->when(! $uo->isAdmin(),function($query) use ($uo) {
+				return $query->whereIn('id',$uo->systems->pluck('id'))
+					->orWhere($this->getTable().'.active',TRUE);
+			})
+			->orderBy('name');
+	}
+
 	/* RELATIONS */
 
 	public function addresses()