jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.优化课程通知模块 

2.优化文件上传
This commit is contained in:
nwb 2014-07-22 16:49:32 +08:00
parent 8f74241eda
commit a5d829b95e
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/attachments_controller.rb
View File

@ -172,7 +172,7 @@ class AttachmentsController < ApplicationController
respond_to do |format| respond_to do |format|
# modify by nwb # modify by nwb
if @attachment.container_type == 'Course' if @attachment.container.is_a?(Course) || @attachment.container.course
if @course.nil? if @course.nil?
format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) } format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
else else
@ -285,6 +285,8 @@ private
raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
if @attachment.container_type == 'Course' if @attachment.container_type == 'Course'
@course = @attachment.course @course = @attachment.course
elsif @attachment.container.course
@course = @attachment.container.course
else else
unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication'
@project = @attachment.project @project = @attachment.project

6
app/controllers/news_controller.rb
View File

@ -98,9 +98,11 @@ class NewsController < ApplicationController
end end
def new def new
#modify by nwb
if @project
@news = News.new(:project => @project, :author => User.current) @news = News.new(:project => @project, :author => User.current)
@course_tag = @project.project_type elsif @course
if @course_tag @news = News.new(:course => @course, :author => User.current)
render :layout => 'base_courses' render :layout => 'base_courses'
end end
end end

6
lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
View File

@ -83,6 +83,12 @@ module Redmine
end end
def save_attachments(attachments, author=User.current) def save_attachments(attachments, author=User.current)
# 清除临时文件
tempAttach = attachments[:dummy]
if tempAttach && tempAttach[:file]
attachments.delete(:dummy)
end
if attachments.is_a?(Hash) if attachments.is_a?(Hash)
attachments = attachments.stringify_keys attachments = attachments.stringify_keys
attachments = attachments.to_a.sort {|a, b| attachments = attachments.to_a.sort {|a, b|