From 012db21b0dd12e341ff29d7d0242ec78e62effbd Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 31 Oct 2014 16:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug<=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=89=88--=E9=A1=B9=E7=9B=AE=E7=89=88--=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=EF=BC=9A=E6=88=90=E5=8A=9F=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=9F=90=E4=BA=9B=E8=B5=84=E6=BA=90=EF=BC=8C=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=86=85=E5=AE=B9=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=8D=B4=E5=B9=B6=E6=9C=AA=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: alan <547533434@qq.com>
---
 app/controllers/files_controller.rb   | 1 +
 app/views/files/_course_file.html.erb | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 8dd8ba93f..91176efdf 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -265,6 +265,7 @@ class FilesController < ApplicationController
                   'size' => "#{Attachment.table_name}.filesize",
                   'downloads' => "#{Attachment.table_name}.downloads"
     sort=''
+
     if params[:sort]
       params[:sort].split(",").each do |sort_type|
         order_by = sort_type.split(":")
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index a1dae9a33..9f476aba8 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -2,6 +2,7 @@
 <% attachmenttypes = @course.attachmenttypes %>
 <% sufixtypes = @course.contenttypes %>
 
+
 <span class="borad-title"><%=  t(:label_user_course) %>资源共享区</span>
 
 <div class="content-title-top">
@@ -49,7 +50,8 @@
     <% if attachmenttypes.any? %>
         &nbsp; &nbsp; &nbsp;
         <label for="attachment_browse_label"><%= l(:attachment_browse) %></label>
-        <%= select_tag "attachment_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_from_collection_for_select(attachmenttypes, "id", "typeName"),
+        <%= select_tag "attachment_browse", content_tag(:option, l(:attachment_all), :value => '0'  ) +options_from_collection_for_select(attachmenttypes, "id", "typeName", params[:type]),
+
                        :onchange => "course_attachmenttypes_searchex(this.value)" %>
     <% end %>
     <% if sufixtypes.any? %>