From 68cadba317bf0f65019a177b0b14ca896c3e53ee Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 26 Dec 2014 15:35:38 +0800
Subject: [PATCH] =?UTF-8?q?#1710=20=E6=B5=8B=E8=AF=95=E7=89=88--=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE--=E4=BD=9C=E5=93=81=E4=B8=8B=E8=BD=BD=EF=BC=9A?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=BB=E6=84=8F=E5=86=85=E5=AE=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E9=83=BD=E5=BC=B9=E5=87=BAerror=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index d87992ec8..56f760e13 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -395,16 +395,18 @@ class FilesController < ApplicationController
           render :layout => 'base_courses'
         }
       end
+   else
+     show_attachments @containers
+     @attachtype = params[:type].to_i
+     @contenttype = params[:contentType].to_s
+
+     respond_to do |format|
+        format.js
+        format.html
+     end
    end
 
-    show_attachments @containers
-    @attachtype = params[:type].to_i
-    @contenttype = params[:contentType].to_s
 
-    respond_to do |format|
-       format.js
-       format.html
-    end
 
   end
 end