Fix inner join bug

DaneEveritt · DaneEveritt · commit 65a91baa16db · 2016-01-08T20:39:16.000-05:00
diff --git a/app/Http/Middleware/CheckServer.php b/app/Http/Middleware/CheckServer.php
@@ -25,7 +25,7 @@ public function handle($request, Closure $next)
 
         $server = Server::getByUUID($request->route()->server);
         if (!$server) {
-            return redirect()->route('index');
+            return response()->view('errors.403', [], 403);
         }
 
         if ($server->installed !== 1) {
diff --git a/app/Models/Server.php b/app/Models/Server.php
@@ -113,7 +113,7 @@ public static function getByUUID($uuid)
         }
 
         $query = self::select('servers.*', 'services.file as a_serviceFile')
-            ->join('services', 'services.id', '=', 'servers.id')
+            ->join('services', 'services.id', '=', 'servers.service')
             ->where('uuidShort', $uuid)->where('active', 1);
 
         if (self::$user->root_admin !== 1) {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function handle($request, Closure $next)`
`25`	`25`
`26`	`26`	`$server = Server::getByUUID($request->route()->server);`
`27`	`27`	`if (!$server) {`
`28`		`- return redirect()->route('index');`
	`28`	`+ return response()->view('errors.403', [], 403);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`if ($server->installed !== 1) {`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public static function getByUUID($uuid)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`$query = self::select('servers.*', 'services.file as a_serviceFile')`
`116`		`- ->join('services', 'services.id', '=', 'servers.id')`
	`116`	`+ ->join('services', 'services.id', '=', 'servers.service')`
`117`	`117`	`->where('uuidShort', $uuid)->where('active', 1);`
`118`	`118`
`119`	`119`	`if (self::$user->root_admin !== 1) {`