From 9f26ef468c8f7a52ce14ec56318503c995fadc1b Mon Sep 17 00:00:00 2001
From: t123yh <t123yh@outlook.com>
Date: Mon, 28 Aug 2017 19:05:00 +0800
Subject: [PATCH] Move sorting to utils.

---
 views/ranklist.ejs | 17 -----------------
 views/util.ejs     | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/views/ranklist.ejs b/views/ranklist.ejs
index 143f662..e296ea5 100644
--- a/views/ranklist.ejs
+++ b/views/ranklist.ejs
@@ -1,23 +1,6 @@
 <% this.title = '排名' %>
 <% include header %>
 
-<% 
-const getOrderString = function(order) {
-  return order ? 'asc' : 'desc';
-}
-const createSortableTitle = function(item, display, defaultOrder) {
-  const isCurrent = curSort === item;
-  console.log("IScurrent: ========> " + isCurrent);
-  const url = syzoj.utils.makeUrl(['ranklist'], 
-    { 
-      sort: item, 
-      order: getOrderString(isCurrent ? (!curOrder) : defaultOrder)
-    });
-  const triangle = isCurrent ? `<i class="${curOrder ? "angle up" : "angle down"} icon"></i>` : "";
-  return `<a href="${url}">${display}${triangle}</a>`;
-}
-%>
-
 <div class="padding">
   <form action="<%= syzoj.utils.makeUrl(['find_user']) %>" class="ui mini form" method="get" role="form" style="margin-bottom: 25px; text-align: right; ">
     <div class="ui action left icon input inline" style="width: 180px; margin-right: 77px; ">
diff --git a/views/util.ejs b/views/util.ejs
index 942ba9d..13c9a81 100644
--- a/views/util.ejs
+++ b/views/util.ejs
@@ -4,6 +4,21 @@ this.getStatusMeta = (status) => {
   else return status;
 };
 
+const getOrderString = function(order) {
+  return order ? 'asc' : 'desc';
+}
+this.createSortableTitle = function(item, display, defaultOrder) {
+  const isCurrent = curSort === item;
+  console.log(isCurrent ? (!curOrder) : defaultOrder)
+  const url = syzoj.utils.makeUrl(req, 
+    Object.assign({}, req.query, { 
+      sort: item, 
+      order: getOrderString(isCurrent ? (!curOrder) : defaultOrder)
+    }));
+  const triangle = isCurrent ? `<i class="${curOrder ? "angle up" : "angle down"} icon"></i>` : "";
+  return `<a href="${url}">${display}${triangle}</a>`;
+}
+
 this.isPending = (status) => {
   let pending = [
     'Waiting',