Commit f650f754
Changed files (2)
app
controllers
app/controllers/categories_controller.rb
@@ -3,7 +3,7 @@ class CategoriesController < ApplicationController
def show
@category = Category.where(:slug => params[:id]).first
if @category
- @creations = Creation.joins(:categories).where(:categories => {:slug => params[:id]}).page(params[:page]).per(12)
+ @creations = Creation.includes(:user).joins(:categories).where(:categories => {:slug => params[:id]}).page(params[:page]).per(12)
else
redirect_to "/tags/#{params[:id]}"
end
app/controllers/search_controller.rb
@@ -4,8 +4,8 @@ class SearchController < ApplicationController
if @search.blank?
redirect_to(home_index_url)
else
- @creations = Creation.search(@search).page(params[:page]).per(100)
- @members = User.where("upper(name) like upper(?)", "%#{@search}%")
+ @creations = Creation.includes(:user).search(@search).page(params[:page]).per(100)
+ @members = User.includes(:avatar).where("upper(name) like upper(?)", "%#{@search}%")
end
end
end