Merge pull request #1161 from openmultiplechoice/schu/filter-module-view-decks-list

Filter module view decks list

Author: schu

app/Http/Controllers/ModuleController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
 use App\Models\Module;
@@ -62,9 +63,22 @@ public function show(Module $module)
     {
         $subjects = Subject::orderBy('name')->get();
 
+        $decks = $module->decks
+            ->filter(function ($deck) {
+                return $deck->isPublic() || $deck->isOwnedByUser(Auth::user());
+            })
+            ->sortBy('name')
+            ->map(function ($deck) {
+                return (object) [
+                    'id' => $deck->id,
+                    'name' => $deck->name,
+                ];
+            });
+
         return view('module', [
             'module' => $module,
             'subjects' => $subjects,
+            'decks' => $decks,
         ]);
     }
 

app/Models/Deck.php

@@ -61,4 +61,18 @@ public function bookmarked()
     {
         return $this->bookmarks()->where('user_id', Auth::id())->exists();
     }
+
+    public function isPublic()
+    {
+        return in_array($this->access, [
+            'public-rw-listed',
+            'public-rw',
+            'public-ro',
+        ]);
+    }
+
+    public function isOwnedByUser(User $user)
+    {
+        return $this->user_id === $user->id;
+    }
 }

resources/views/module.blade.php

@@ -33,7 +33,7 @@
     <div class="col">
         <h4>Decks</h4>
         <ul>
-            @foreach ($module->decks->sortByDesc('name') as $deck)
+            @foreach ($decks as $deck)
                 <li><a href="{{ url('decks/'. $deck->id) }}">{{ $deck->name }}</a></li>
             @endforeach
         </ul>