修改bug《选定了内容类型后再点击表头进行排序总是返回一个空白页》
Signed-off-by: alan <547533434@qq.com>
This commit is contained in:
parent
2bd08d1aaa
commit
a6698bf2f1
|
@ -16,7 +16,11 @@
|
|||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
class FilesController < ApplicationController
|
||||
layout 'base_projects'#by young
|
||||
if @project
|
||||
layout 'base_projects' #by young
|
||||
else
|
||||
layout 'base_courses'
|
||||
end
|
||||
menu_item :files
|
||||
|
||||
before_filter :find_project_by_project_id#, :except => [:getattachtype]
|
||||
|
@ -300,25 +304,25 @@ class FilesController < ApplicationController
|
|||
@containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]
|
||||
@containers += @project.versions.includes(:attachments).reorder(sort).all
|
||||
|
||||
show_attachments @containers
|
||||
@attachtype = params[:type].to_i
|
||||
@contenttype = params[:contentType].to_s
|
||||
render :layout => 'base_projects'
|
||||
|
||||
#render :layout => 'base_projects'
|
||||
elsif @course
|
||||
@isproject = false
|
||||
@containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
|
||||
# show_attachments @containers
|
||||
# @attachtype = params[:type].to_i
|
||||
# @contenttype = params[:contentType].to_s
|
||||
|
||||
end
|
||||
|
||||
show_attachments @containers
|
||||
@attachtype = params[:type].to_i
|
||||
@contenttype = params[:contentType].to_s
|
||||
render :layout => 'base_courses'
|
||||
|
||||
respond_to do |format|
|
||||
format.js
|
||||
format.html
|
||||
end
|
||||
|
||||
|
||||
|
||||
# respond_to do |format|
|
||||
# format.js
|
||||
# format.html
|
||||
# end
|
||||
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue