Skip to content

bug fix for Users can edit and rename shelves #5458 #5514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
inv-hareesh wants to merge 1 commit into from
Closed

bug fix for Users can edit and rename shelves #5458 #5514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions app/Entities/Controllers/BookshelfController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Exception;
use Illuminate\Http\Request;
use Illuminate\Validation\ValidationException;
use Illuminate\Support\Facades\Auth;

class BookshelfController extends Controller
{
Expand Down Expand Up @@ -68,6 +69,13 @@ public function index(Request $request)
*/
public function create()
{
$user = Auth::user();
$roles = $user->roles;

// Check if the user has the "Admin" role
if (!$roles->contains('display_name', 'Admin')) {
return redirect()->back()->with('error', 'You do not have permission to create bookshelf.');
}
$this->checkPermission('bookshelf-create-all');
$books = $this->bookQueries->visibleForList()->orderBy('name')->get(['name', 'id', 'slug', 'created_at', 'updated_at']);
$this->setPageTitle(trans('entities.shelves_create'));
Expand All @@ -83,6 +91,13 @@ public function create()
*/
public function store(Request $request)
{
$user = Auth::user();
$roles = $user->roles;

// Check if the user has the "Admin" role
if (!$roles->contains('display_name', 'Admin')) {
return redirect()->back()->with('error', 'You do not have permission to store bookshelf.');
}
$this->checkPermission('bookshelf-create-all');
$validated = $this->validate($request, [
'name' => ['required', 'string', 'max:255'],
Expand Down Expand Up @@ -142,6 +157,13 @@ public function show(Request $request, ActivityQueries $activities, string $slug
*/
public function edit(string $slug)
{
$user = Auth::user();
$roles = $user->roles;

// Check if the user has the "Admin" role
if (!$roles->contains('display_name', 'Admin')) {
return redirect()->back()->with('error', 'You do not have permission to edit bookshelf.');
}
$shelf = $this->queries->findVisibleBySlugOrFail($slug);
$this->checkOwnablePermission('bookshelf-update', $shelf);

Expand All @@ -168,6 +190,13 @@ public function edit(string $slug)
*/
public function update(Request $request, string $slug)
{
$user = Auth::user();
$roles = $user->roles;

// Check if the user has the "Admin" role
if (!$roles->contains('display_name', 'Admin')) {
return redirect()->back()->with('error', 'You do not have permission to update bookshelf.');
}
$shelf = $this->queries->findVisibleBySlugOrFail($slug);
$this->checkOwnablePermission('bookshelf-update', $shelf);
$validated = $this->validate($request, [
Expand All @@ -194,6 +223,13 @@ public function update(Request $request, string $slug)
*/
public function showDelete(string $slug)
{
$user = Auth::user();
$roles = $user->roles;

// Check if the user has the "Admin" role
if (!$roles->contains('display_name', 'Admin')) {
return redirect()->back()->with('error', 'You do not have permission to delete bookshelf.');
}
$shelf = $this->queries->findVisibleBySlugOrFail($slug);
$this->checkOwnablePermission('bookshelf-delete', $shelf);

Expand All @@ -209,6 +245,13 @@ public function showDelete(string $slug)
*/
public function destroy(string $slug)
{
$user = Auth::user();
$roles = $user->roles;

// Check if the user has the "Admin" role
if (!$roles->contains('display_name', 'Admin')) {
return redirect()->back()->with('error', 'You do not have permission to destroy bookshelf.');
}
$shelf = $this->queries->findVisibleBySlugOrFail($slug);
$this->checkOwnablePermission('bookshelf-delete', $shelf);

Expand Down
Loading