chiu
/
archive1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update archives_controller.rb 

fix
This commit is contained in:
chiu 2019-09-19 22:21:45 +08:00
parent e7553492bf
commit e3ce0c91fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/archives_controller.rb
View File

@ -19,7 +19,7 @@ class ArchivesController < ApplicationController
all_categories_with_nil = ArchiveCategory.all.in(sort_number: nil) all_categories_with_nil = ArchiveCategory.all.in(sort_number: nil)
all_categories_no_nil = ArchiveCategory.all.not_in(sort_number: nil).order_by(sort_number: 'desc') all_categories_no_nil = ArchiveCategory.all.not_in(sort_number: nil).order_by(sort_number: 'desc')
categories_sort = all_categories_no_nil.concat(all_categories_with_nil).collect do |cat| categories_sort = all_categories_no_nil.concat(all_categories_with_nil).collect do |cat|
categories.select{|category| category.id.to_s == cat.category_id.to_s)[0] categories.select{|category| category.id.to_s == cat.category_id.to_s}[0]
end end
cats_last = [] cats_last = []
categories_sort.each do |category| categories_sort.each do |category|
@ -83,7 +83,7 @@ class ArchivesController < ApplicationController
all_categories_with_nil = ArchiveCategory.all.in(sort_number: nil) all_categories_with_nil = ArchiveCategory.all.in(sort_number: nil)
all_categories_no_nil = ArchiveCategory.all.not_in(sort_number: nil).order_by(sort_number: 'desc') all_categories_no_nil = ArchiveCategory.all.not_in(sort_number: nil).order_by(sort_number: 'desc')
categories_sort = all_categories_no_nil.concat(all_categories_with_nil).collect do |cat| categories_sort = all_categories_no_nil.concat(all_categories_with_nil).collect do |cat|
categories.select{|category| category.id.to_s == cat.category_id.to_s)[0] categories.select{|category| category.id.to_s == cat.category_id.to_s}[0]
end end
cats = categories_sort.collect do |category| cats = categories_sort.collect do |category|
url_to_edit = OrbitHelper.user_has_cateogry?(category) ? "/admin/archive_files?filters[category][]=#{category.id.to_s}" : "" url_to_edit = OrbitHelper.user_has_cateogry?(category) ? "/admin/archive_files?filters[category][]=#{category.id.to_s}" : ""