webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Revert "Bookstack grid view."

Browse Source
This commit is contained in:
Abijeet
2017-07-07 17:28:34 +05:30
committed by GitHub
parent a663fc8aa8
commit 3fd61a3600
27 changed files with 29 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Book.php
View File

@ -3,7 +3,7 @@
class Book extends Entity
{
protected $fillable = ['name', 'description', 'image'];
protected $fillable = ['name', 'description'];
/**
* Get the url for this book.
@ -18,24 +18,6 @@ class Book extends Entity
return baseUrl('/books/' . urlencode($this->slug));
}
public function getBookCover($size = 120)
{
$default = baseUrl('/default.png');
$image = $this->image;
if ($image === 0 || $image === '0' || $image === null)
return $default;
try {
$cover = $this->cover ? baseUrl($this->cover->getThumb(120, 192, false)) : $default;
} catch (\Exception $err) {
$cover = $default;
}
return $cover;
}
public function cover()
{
return $this->belongsTo(Image::class, 'image');
}
/*
* Get the edit url for this book.
* @return string

10
app/Http/Controllers/BookController.php
View File

@ -39,9 +39,9 @@ class BookController extends Controller
$books = $this->entityRepo->getAllPaginated('book', 16);
$recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false;
$popular = $this->entityRepo->getPopular('book', 3, 0);
$books_display = $this->currentUser->books_display;
$display = $this->currentUser->display;
$this->setPageTitle('Books');
return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'books_display' => $books_display] );
return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular, 'display' => $display]); //added displaly to access user display
}
/**
@ -115,9 +115,9 @@ class BookController extends Controller
'name' => 'required|string|max:255',
'description' => 'string|max:1000'
]);
$book = $this->entityRepo->updateFromInput('book', $book, $request->all());
Activity::add($book, 'book_update', $book->id);
return redirect($book->getUrl());
$book = $this->entityRepo->updateFromInput('book', $book, $request->all());
Activity::add($book, 'book_update', $book->id);
return redirect($book->getUrl());
}
/**

2
app/User.php
View File

@ -22,7 +22,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
* The attributes that are mass assignable.
* @var array
*/
protected $fillable = ['name', 'email', 'image_id', 'books_display' ];
protected $fillable = ['name', 'email', 'image_id'];
/**
* The attributes excluded from the model's JSON form.