Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts: app/views/layouts/new_base_user.html.erbBranch_szzh
suntao
10 years ago
commit
3e9bb8a596
@ -1,4 +1,5 @@
|
||||
|
||||
closeModal();
|
||||
$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
|
||||
//这里不能将翻页的更新
|
||||
//这里不能将翻页的更新
|
||||
$("#res_all_count").html(parseInt($("#res_all_count").html())+1);
|
||||
@ -0,0 +1,80 @@
|
||||
# encoding: UTF-8
|
||||
class ForgeMessages < ActiveRecord::Migration
|
||||
def up
|
||||
Project.all.each do |project|
|
||||
transaction do
|
||||
project.forge_messages << ForgeMessage.new(:user_id => project.user_id, :project_id => project.id)
|
||||
|
||||
# 新闻
|
||||
project.news.each do |new|
|
||||
new.project.members.each do |m|
|
||||
if m.user_id != new.author_id
|
||||
if m.created_on < new.created_on # 在成员加入项目之后
|
||||
new.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => new.project_id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# 新闻回复
|
||||
project.news.each do |new|
|
||||
if new.comments
|
||||
new.comments.each do |comment|
|
||||
if comment.author_id != comment.commented.author_id
|
||||
comment.forge_messages << ForgeMessage.new(:user_id => comment.commented.author_id, :project_id => comment.commented.project.id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# 讨论区
|
||||
if project.boards.first
|
||||
project.boards.first.messages.each do |message|
|
||||
if message.parent_id.nil? # 主贴
|
||||
message.project.members.each do |m|
|
||||
if m.user_id != message.author_id
|
||||
if m.created_on < message.created_on
|
||||
message.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => message.board.project_id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
else # 回帖
|
||||
message.project.members.each do |m|
|
||||
if m.user_id == Message.find(message.parent_id).author_id && m.user_id != message.author_id # 只针对主贴回复，回复自己的帖子不发消息
|
||||
if m.created_on < message.created_on
|
||||
message.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => message.board.project_id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# 缺陷
|
||||
project.issues.each do |issue|
|
||||
unless issue.author_id == issue.assigned_to_id
|
||||
issue.forge_messages << ForgeMessage.new(:user_id => issue.assigned_to_id, :project_id => issue.project_id, :viewed => true)
|
||||
end
|
||||
end
|
||||
|
||||
# 缺陷更新
|
||||
project.issues.each do |issue|
|
||||
if issue.journals
|
||||
issue.journals.each do |journal|
|
||||
if journal.user_id != journal.issue.author_id
|
||||
journal.forge_messages << ForgeMessage.new(:user_id => journal.issue.author_id, :project_id => journal.issue.project_id, :viewed => true)
|
||||
end
|
||||
if journal.user_id != journal.issue.assigned_to_id && journal.issue.assigned_to_id != journal.issue.author_id # 指派人不是自己的话，则给指派人发送
|
||||
journal.forge_messages << ForgeMessage.new(:user_id => journal.issue.assigned_to_id, :project_id => journal.issue.project_id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,115 @@
|
||||
# encoding: UTF-8
|
||||
class CourseMessages < ActiveRecord::Migration
|
||||
def up
|
||||
Course.all.each do |course|
|
||||
transaction do
|
||||
course.course_messages << CourseMessage.new(:user_id => course.tea_id,:course_id => course.id)
|
||||
# 作业
|
||||
course.homework_commons.each do |homework_common|
|
||||
homework_common.course.members.each do |m|
|
||||
if m.user_id != homework_common.user_id
|
||||
if m.created_on < homework_common.created_at
|
||||
homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# 通知
|
||||
course.news.each do |new|
|
||||
new.course.members.each do |m|
|
||||
if m.user_id != new.author_id
|
||||
if m.created_on < new.created_on # 在成员加入课程之后
|
||||
new.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# 通知的回复
|
||||
course.news.each do |new|
|
||||
if new.comments
|
||||
new.comments.each do |comment|
|
||||
if comment.author_id != comment.commented.author_id
|
||||
comment.course_messages << CourseMessage.new(:user_id => comment.commented.author_id, :course_id => course.id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# 讨论区
|
||||
if course.boards.first
|
||||
course.boards.first.messages.each do |message|
|
||||
if message.parent_id.nil? # 主贴
|
||||
message.course.members.each do |m|
|
||||
if message.author.allowed_to?(:as_teacher, message.course) && m.user_id != message.author_id # 老师 自己的帖子不给自己发送消息
|
||||
if m.created_on < message.created_on
|
||||
message.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
else # 回帖
|
||||
message.course.members.each do |m|
|
||||
if m.user_id == Message.find(message.parent_id).author_id && m.user_id != message.author_id # 只针对主贴回复，回复自己的帖子不发消息
|
||||
if m.created_on < message.created_on
|
||||
message.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# 问卷
|
||||
Poll.where("polls_type = 'Course' and polls_group_id = #{course.id}").each do |poll|
|
||||
if poll.polls_status == 2 #问卷是发布状态
|
||||
Course.find(poll.polls_group_id).members.each do |m|
|
||||
if m.user_id != poll.user_id
|
||||
if m.created_on < poll.created_at
|
||||
poll.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => true)
|
||||
end
|
||||
end
|
||||
end
|
||||
elsif poll.polls_status == 1 #问卷是新建状态
|
||||
poll.course_messages.destroy_all
|
||||
end
|
||||
end
|
||||
|
||||
# 作品评阅
|
||||
# course.homework_commons.each do |homework_common|
|
||||
# if homework_common.student_works
|
||||
# homework_common.student_works.each do |student_work|
|
||||
# if student_work.student_works_scores
|
||||
# student_work.student_works_scores.each do |student_works_score|
|
||||
# receiver = student_works_score.student_work.user
|
||||
# if student_works_score.created_at == student_works_score.updated_at
|
||||
# if student_works_score.comment.nil?
|
||||
# student_works_score.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => course.id,
|
||||
# :viewed => true, :content => "作业评分：#{student_works_score.score}", :status=> true)
|
||||
# else
|
||||
# student_works_score.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => course.id,
|
||||
# :viewed => true, :content => "作业评分：#{student_works_score.score} 评语：#{student_works_score.comment}", :status=> true)
|
||||
# end
|
||||
# else # 更新
|
||||
# if student_works_score.comment.nil?
|
||||
# student_works_score.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => course.id,
|
||||
# :viewed => true, :content => "作业评分：#{student_works_score.score}", :status=> true)
|
||||
# else
|
||||
# student_works_score.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => course.id,
|
||||
# :viewed => true, :content => "作业评分：#{student_works_score.score} 评语：#{student_works_score.comment}", :status=> true)
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
# 作品讨论
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,26 @@
|
||||
class UpdateMessageTime < ActiveRecord::Migration
|
||||
def up
|
||||
course_count = CourseMessage.all.count / 30 + 1
|
||||
transaction do
|
||||
for i in 1 ... course_count do i
|
||||
CourseMessage.page(i).per(30).each do |cmessage|
|
||||
if cmessage.course_message
|
||||
if cmessage.course_message.respond_to?("created_at")
|
||||
cmessage.created_at = cmessage.course_message.created_at
|
||||
elsif cmessage.course_message.respond_to?("created_on")
|
||||
cmessage.created_at = cmessage.course_message.created_on
|
||||
end
|
||||
cmessage.save
|
||||
|
||||
course_all_message = MessageAll.where("message_type = '#{cmessage.class.to_s}' and message_id = '#{cmessage.id}'").first
|
||||
course_all_message.created_at = cmessage.created_at
|
||||
course_all_message.save
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,26 @@
|
||||
class UpdateForgeMessageTime < ActiveRecord::Migration
|
||||
def up
|
||||
forge_count = ForgeMessage.all.count / 30 + 1
|
||||
transaction do
|
||||
for i in 1 ... forge_count do i
|
||||
ForgeMessage.page(i).per(30).each do |fmessage|
|
||||
if fmessage.forge_message
|
||||
if fmessage.forge_message.respond_to?("created_at")
|
||||
fmessage.created_at = fmessage.forge_message.created_at
|
||||
elsif fmessage.forge_message.respond_to?("created_on")
|
||||
fmessage.created_at = fmessage.forge_message.created_on
|
||||
end
|
||||
fmessage.save
|
||||
|
||||
forge_all_message = MessageAll.where("message_type = '#{fmessage.class.to_s}' and message_id = '#{fmessage.id}'").first
|
||||
forge_all_message.created_at = fmessage.created_at
|
||||
forge_all_message.save
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue