Fix bug.
This commit is contained in:
parent
9abe9b71b6
commit
c40c552a1d
|
@ -276,7 +276,7 @@ class Admin::GalleriesController < OrbitAdminController
|
||||||
@filter_fields.delete(:status)
|
@filter_fields.delete(:status)
|
||||||
albums1 = Album.where(:order.in => [nil,-1]).desc(:created_at).with_categories(filters("category")).with_tags(filters("tag"))
|
albums1 = Album.where(:order.in => [nil,-1]).desc(:created_at).with_categories(filters("category")).with_tags(filters("tag"))
|
||||||
albums1 = search_data(albums1,[:name])
|
albums1 = search_data(albums1,[:name])
|
||||||
albums2 = Album.where(:order.gt => -1).asc(:order).with_categories(filters("category")).with_tags(filters("tag"))
|
albums2 = Album.all.where(:order.ne=>-1).and(:order.ne=>nil).asc(:order).with_categories(filters("category")).with_tags(filters("tag"))
|
||||||
albums2 = search_data(albums2,[:name])
|
albums2 = search_data(albums2,[:name])
|
||||||
@fiter_albums = albums1.concat(albums2)
|
@fiter_albums = albums1.concat(albums2)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue