Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

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