From 8d953e133603fd8414c8b5fee6d3314adb3be9ab Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 12 May 2016 20:00:26 +0800 Subject: [PATCH] manual sort for archive top --- app/controllers/archives_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/archives_controller.rb b/app/controllers/archives_controller.rb index 26721a8..585c0ba 100644 --- a/app/controllers/archives_controller.rb +++ b/app/controllers/archives_controller.rb @@ -8,7 +8,7 @@ class ArchivesController < ApplicationController page.save end end - files_by_cateogry = ArchiveFile.where(is_hidden: false).filter_by_categories.filter_by_tags.order_by([:is_top, :desc],[:sort_number, :asc]).group_by(&:category) + files_by_cateogry = ArchiveFile.where(is_hidden: false).filter_by_categories.filter_by_tags.group_by(&:category) categories = files_by_cateogry.keys cats = categories.collect do |category| url_to_edit = OrbitHelper.user_has_cateogry?(category) ? "/admin/archive_files?filters[category][]=#{category.id.to_s}" : "" @@ -35,10 +35,12 @@ class ArchivesController < ApplicationController "archive-title" => archive.title, "statuses" => statuses, "sort_number" => archive.sort_number, + "is_top" => (archive.is_top ? 1 : 0), "files" => files } end sorted = archives.sort_by{|k,v| k["sort_number"].to_i} + sorted = sorted.sort_by{|k,v| v["is_top"]} { "category-title" => category.title, "archives" => sorted,