From a77b07a99b05d899d19e8697bd12088071c4530e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 27 Aug 2014 17:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb | 53 +++++++++++++++++------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 3d541fd61..f8b4578eb 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -57,36 +57,45 @@ class FilesController < ApplicationController
     elsif params[:course_id]
       @isproject = false
 
+      sort = ""
       if params[:sort]
-        if params[:sort].include?":"
-          @orderBy = params[:sort].split(":")[0]
-          @orderType = params[:sort].split(":")[1].split(",")[0]
-        else
-          @orderBy = params[:sort].split(",")[0]
-          @orderType = "asc"
+        params[:sort].split(",").each do |sort_type|
+          order_by = sort_type.split(":")
+
+          case order_by[0]
+            when "filename"
+              attribute = "filename"
+            when "size"
+              attribute = "filesize"
+            when "attach_type"
+              attribute = "attachtype"
+            when "content_type"
+              attribute = "created_on"
+            when "field_file_dense"
+              attribute = "is_public"
+            when "downloads"
+              attribute = "downloads"
+            when "created_on"
+              attribute = "created_on"
+          end
+
+          if order_by.count == 1
+            sort += "#{Attachment.table_name}.#{attribute} desc "
+          elsif order_by.count == 2
+            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+          end
+          if sort_type != params[:sort].split(",").last
+            sort += ","
+          end
         end
       end
-
-      if @orderBy=="size"
-         @orderBy="filesize"
-      elsif @orderBy=="field_file_dense"
-        @orderBy="is_public"
-      elsif @orderBy=="attach_type"
-        @orderBy="attachtype"
-      elsif @orderBy=="content_type"
-        @orderBy="attachtype"
-      end
-
-      if @orderBy
-        @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.#{@orderBy} #{@orderType}").find(@course.id)]
-      else
-        @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on desc").find(@course.id)]
-      end
+      @containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
 
       show_attachments @containers
 
       render :layout => 'base_courses'
     end
+
   end
 
   def new