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

app/controllers/files_controller.rb

@@ -395,8 +395,7 @@ class FilesController < ApplicationController
           render :layout => 'base_courses'
         }
       end
-   end
-
+   else
      show_attachments @containers
      @attachtype = params[:type].to_i
      @contenttype = params[:contentType].to_s
@@ -405,6 +404,9 @@ class FilesController < ApplicationController
         format.js
         format.html
      end
+   end
+
+
 
   end
 end