From 715c51552c9cfba8ece60ebe95d76546fdf842f4 Mon Sep 17 00:00:00 2001
From: bohung <bohung@rulingcom.com>
Date: Fri, 5 Feb 2021 08:33:41 +0800
Subject: [PATCH] Fix bug.

---
 app/controllers/archives_controller.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/controllers/archives_controller.rb b/app/controllers/archives_controller.rb
index ce3105d..6ec1756 100644
--- a/app/controllers/archives_controller.rb
+++ b/app/controllers/archives_controller.rb
@@ -121,6 +121,15 @@ class ArchivesController < ApplicationController
     				"url_to_edit" => url_to_edit
     			}
     		end
+            if ArchiveSortOrder.first['sort_order'] #Order with ascending
+                cats = cats.collect do |cat|
+                    Hash[cat.map{|k,v| [k,k=='archives' ? (v.sort_by{|tp| [(tp['sort_number'].nil? ? Float::INFINITY : tp['sort_number'].to_i),-tp['created_at']]}) : v] }]
+                end
+            else
+                cats = cats.collect do |cat|
+                    Hash[cat.map{|k,v| [k,k=='archives' ? (v.sort_by{|tp| [(tp['sort_number'].nil? ? Float::INFINITY : -tp['sort_number'].to_i),-tp['created_at']]}) : v] }]
+                end
+            end
             if params[:data_count].to_i <=0
                 page_data_count = 0
             else