Refactored article_categories.
This commit is contained in:
parent
0b1682af7c
commit
0decbb36e1
12 changed files with 39 additions and 118 deletions
|
|
@ -28,8 +28,8 @@ class ArticlesController < ApplicationController
|
|||
# if somebody uses the search field:
|
||||
conditions = ["articles.name LIKE ?", "%#{params[:query]}%"] unless params[:query].nil?
|
||||
|
||||
@total = @supplier.articles.without_deleted.count(:conditions => conditions)
|
||||
@articles = @supplier.articles.without_deleted.paginate(
|
||||
@total = @supplier.articles.count(:conditions => conditions)
|
||||
@articles = @supplier.articles.paginate(
|
||||
:order => sort,
|
||||
:conditions => conditions,
|
||||
:page => params[:page],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue