saurabh
/
gallery
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

# Conflicts:
#   app/controllers/galleries_controller.rb
This commit is contained in:
wmcheng 2019-11-05 23:53:44 +08:00
parent 3925c22408 cb44a8c9af
commit e76fb42be6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/galleries_controller.rb
View File

@ -17,6 +17,7 @@ class GalleriesController < ApplicationController
tags << tag0 tags << tag0
tags << tag1 tags << tag1
end end
def index def index
albums = Album.filter_by_categories.filter_by_tags.asc(:order) albums = Album.filter_by_categories.filter_by_tags.asc(:order)
galleries = albums.collect do |a| galleries = albums.collect do |a|
@ -60,6 +61,7 @@ class GalleriesController < ApplicationController
albums = Album.filter_by_widget_categories.filter_by_tags(tags) albums = Album.filter_by_widget_categories.filter_by_tags(tags)
params = OrbitHelper.params params = OrbitHelper.params
counts = OrbitHelper.widget_data_count counts = OrbitHelper.widget_data_count
images = [] images = []
total_images = 0 total_images = 0
if !albums.blank? if !albums.blank?
@ -127,7 +129,9 @@ class GalleriesController < ApplicationController
} }
render :json => {"data" => data}.to_json render :json => {"data" => data}.to_json
end end
private private
def show_desc? def show_desc?
tags = OrbitHelper.page_tags if tags.blank? tags = OrbitHelper.page_tags if tags.blank?
tags = [tags].flatten.uniq tags = [tags].flatten.uniq