Merge tag 'accesslog' into develop

Fixed access log conflict

app/Http/Controllers/SiswaController.php

@@ -47,8 +47,22 @@ class SiswaController extends Controller
 
         $siswa = Siswa::where('nisn', $request->nisn)
                                               ->where('tanggal_lahir', $tanggalLahir);
-        if ($request->with !== null)
+        if ($request->with !== null) {
+            if (is_array($request->with)) {
+                $relationships = [];
+                foreach ($request->with as $relation) {
+                    if ($relation === 'accessLog')
+                        $relationships[$relation] = function ($query) use ($request) {
+                            $query->where('src', '=', $request->src);
+                        };
+                    else
+                        $relationships[$relation] = function ($query) { $query; };
+                }
+                $request->with = $relationships;
+            }
+
             $siswa = $siswa->with($request->with);
+        }
 
         $siswa = $siswa->first();
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "smk-kelulusan",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smk-kelulusan",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "",
   "main": "webpack.mix.js",
   "directories": {