From d00ad2e14d5353959bb9c52fb840957cbab60aea Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 17 Sep 2015 16:07:41 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5=202?= =?UTF-8?q?=E3=80=81=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E3=80=81=E6=96=B9=E6=B3=95=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/system_messages_controller.rb | 5 +-- app/controllers/users_controller.rb | 4 +- app/models/mailer.rb | 41 +++++++++++++++++++ ...html.erb => user_system_messages.html.erb} | 2 +- config/routes.rb | 2 +- lib/tasks/homework_endtime.rake | 1 + 6 files changed, 48 insertions(+), 7 deletions(-) rename app/views/users/{system_messages.html.erb => user_system_messages.html.erb} (97%) diff --git a/app/controllers/system_messages_controller.rb b/app/controllers/system_messages_controller.rb index 2697f17b5..76fa99e32 100644 --- a/app/controllers/system_messages_controller.rb +++ b/app/controllers/system_messages_controller.rb @@ -14,8 +14,7 @@ class SystemMessagesController < ApplicationController # end def index - render_403 - # @system_messages = SystemMessage.all + @system_messages = SystemMessage.all end # def show @@ -39,7 +38,7 @@ class SystemMessagesController < ApplicationController return end @system_messages = SystemMessage.new - @system_messages.description = params[:system_messages][:description] + @system_messages.description = params[:system_message][:description] @system_messages.user_id = User.current.id respond_to do |format| if @system_messages.save diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c88ceb299..c9253ad59 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -46,7 +46,7 @@ class UsersController < ApplicationController :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index, :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource, :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction, - :user_import_homeworks,:user_search_homeworks,:user_import_resource, :system_messages] + :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages] before_filter :auth_user_extension, only: :show #before_filter :rest_user_score, only: :show #before_filter :select_entry, only: :user_projects @@ -201,7 +201,7 @@ class UsersController < ApplicationController end # 系统消息 - def system_messages + def user_system_messages @sytem_messages = SystemMessage.order("created_at desc").all @sytem_messages = paginateHelper @sytem_messages,25 respond_to do |format| diff --git a/app/models/mailer.rb b/app/models/mailer.rb index c2b66f2a5..931e2dbf0 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -207,6 +207,47 @@ class Mailer < ActionMailer::Base mail :to => user.mail,:subject => subject if has_content end + # 作业截止时间邮件提醒 + def homework_endtime__added(homework_common, course) + # modify by nwb + #如果是直接留言并且留言对象是课程 + if !journals_for_message.at_user && journals_for_message.jour.class.to_s.to_sym == :Course + + @author = journals_for_message.user + #课程的教师 + @members = course_all_member journals_for_message.jour + + + #收件人邮箱 + students = course.student + recipients ||= [] + students.each do |students| + recipients << recipients.user.mail + end + mail :to => @recipients, + :subject => "#{l(:label_your_course)}#{journals_for_message.jour.name}#{l(:label_have_message)} ", + :filter => true + # elsif journals_for_message.jour.class.to_s.to_sym == :Bid + # if !journals_for_message.jour.author.notify_about? journals_for_message + # return -1 + # end + # + # mail :to => recipients, :subject => @title,:filter => true + elsif journals_for_message.jour.class.to_s.to_sym == :Contest + if !journals_for_message.jour.author.notify_about? journals_for_message + return -1 + end + mail :to => recipients, :subject => @title,:filter => true + else + mail :to => recipients1, :subject => @title,:filter => true + end + recipients ||= [] + # 将帖子创建者邮箱地址加入数组 + recipients << course.student + # 回复人邮箱地址加入数组 + recipients << @author.mail + end + # 公共讨论区发帖、回帖添加邮件发送信息 def forum_message_added(memo) @memo = memo diff --git a/app/views/users/system_messages.html.erb b/app/views/users/user_system_messages.html.erb similarity index 97% rename from app/views/users/system_messages.html.erb rename to app/views/users/user_system_messages.html.erb index 495e05fc9..c4cc554f1 100644 --- a/app/views/users/system_messages.html.erb +++ b/app/views/users/user_system_messages.html.erb @@ -25,7 +25,7 @@ <%# 系统贴吧 %>
  • <%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey" %>
    • <%# 系统消息 %> -
  • <%= link_to "系统消息", system_messages_path(User.current), :class => "resourcesGrey" %>
    • +
  • <%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %>
    • diff --git a/config/routes.rb b/config/routes.rb index e35c7ff3b..17a30807c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -389,7 +389,7 @@ RedmineApp::Application.routes.draw do match 'users/:id/user_projects', :to => 'users#user_projects', :via => :get #消息 match 'users/:id/user_messages', :to => 'users#user_messages', :via => :get, :as => "user_message" - match 'users/:id/system_messages', :to => 'users#system_messages', :via => :get, :as => "system_messages" + match 'users/:id/user_system_messages', :to => 'users#user_system_messages', :via => :get, :as => "user_system_messages" #match 'users/:id/user_messages/:homework', :to => 'users#user_messages_homework', :via => :get, :as => "user_message_homewrok" diff --git a/lib/tasks/homework_endtime.rake b/lib/tasks/homework_endtime.rake index 9fef281a3..fe92842e3 100644 --- a/lib/tasks/homework_endtime.rake +++ b/lib/tasks/homework_endtime.rake @@ -10,6 +10,7 @@ namespace :homework_endtime do if homework_common.end_time.day - Date.today.day < 2 && homework_common.end_time.year == Date.today.year homework_common.course.student.each do |s| homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :status => true) + Mailer.run.homework_endtime__added(homework_common, homework_common.course) end end end