Skip to content
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

Jump to bottom

unlist books of the logged in user to be shown up in the latest books… #294

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

unlist books of the logged in user to be shown up in the latest books… #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
48b5ba6
unlist books of the logged in user to be shown up in the latest books…
AmrAdelKhalil Jan 19, 2018
3a7aad0
Merge branch 'master' into unlist_empty_books
AmrAdelKhalil Oct 20, 2018
a03b5cf
Update books_controller.rb
AmrAdelKhalil Oct 20, 2018
21f86c5
Update books_controller.rb
AmrAdelKhalil Oct 20, 2018
5a0c85a
Update books_controller.rb
AmrAdelKhalil Oct 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/controllers/books_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ def show_more
skip_authorization
page = params[:page]

current_user_id = (current_user.nil?) ? nil : current_user.id
books = Book
.most_recent_with_content(page)
.most_recent_with_content(current_user_id, page)
.map do |book|
BookSerializer.new(book)
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/dashboard_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def index
@user = current_user
@hashedEmail = Digest::MD5.hexdigest(@user.email)
@books = Book
.most_recent_with_content
.most_recent_with_content(@user.id)
.map do |book|
BookSerializer.new(book)
end
Expand Down
6 changes: 4 additions & 2 deletions app/models/book.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ class Book < ActiveRecord::Base
after_create :send_admin_notification
self.per_page = 10

def self.most_recent_with_content(page = 1)
joins(:phrase_pairs)
def self.most_recent_with_content(current_user_id = nil, page = 1)
where
.not(user_id: current_user_id)
.joins(:phrase_pairs)
.uniq
.includes(:user)
.order("created_at DESC")
Expand Down