From 1613f41e77243d517065edbcabc0465632382ad0 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 29 Sep 2015 15:44:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_praise_tread.html.erb | 2 +- public/stylesheets/new_user.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/memos/_praise_tread.html.erb b/app/views/memos/_praise_tread.html.erb index 13287836e..32b4a0ac0 100644 --- a/app/views/memos/_praise_tread.html.erb +++ b/app/views/memos/_praise_tread.html.erb @@ -7,7 +7,7 @@ <% if @is_valuate.size > 0 %> <% @flag = @is_valuate.first.praise_or_tread %> <% if @flag == 1 %> - <%= get_praise_num(obj)%> + <%= get_praise_num(obj)%> <% end %> <% else %> <% if user_id == obj.author_id %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index d55da7e75..ace5cb651 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -808,7 +808,7 @@ a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no .postAttIcon:hover {background:url(images/post_image_list.png) 0px -113px no-repeat;} .postThemeContainer {width:720px;} .postThemeWrap {width:655px; float:left;position: relative} -.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-right:30px; margin-top:3px;} +.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-top:3px;} .postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;} a.AnnexBtn{ background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;} From b29546cd135196245ad039ba87cc57c0e34dcbbb Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 29 Sep 2015 15:45:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E4=BA=86=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=96=B0=E9=97=BB=E6=B6=88=E6=81=AF=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=BA=94=E8=AF=A5=E4=B8=BA=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=EF=BC=8C=E8=80=8C=E9=9D=9E=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_forge.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb index 641fb9269..b93122bd2 100644 --- a/app/views/users/_user_message_forge.html.erb +++ b/app/views/users/_user_message_forge.html.erb @@ -197,7 +197,7 @@
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %> ">评论了新闻：
  • - <%= link_to "#{ma.forge_message.comments.html_safe}", + <%= link_to "#{ma.forge_message.commented.title}", {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :onmouseover => "message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %> From 3f6d64877a870d0bb0022af6ac0eac7f570fc1a8 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 29 Sep 2015 15:59:48 +0800 Subject: [PATCH 3/7] =?UTF-8?q?1=E3=80=81=E8=80=81=E5=B8=88=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BD=9C=E4=B8=9A=E8=87=AA=E5=B7=B1=E8=83=BD=E6=94=B6?= =?UTF-8?q?=E5=88=B0=202=E3=80=81=E5=85=B3=E9=97=AD=E7=BB=99=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BA=BA=E5=8F=91=203=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=82=E6=95=B0member=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/homework_common.rb | 4 ++-- app/models/mailer.rb | 19 ++++++++++++------- lib/tasks/homework_evaluation.rake | 7 +++++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index c1e5666ac..796080645 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -40,9 +40,9 @@ class HomeworkCommon < ActiveRecord::Base def act_as_course_message if self.course self.course.members.each do |m| - if m.user_id != self.user_id + # if m.user_id != self.user_id self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false) - end + # end end end end diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 52b7242dd..6c4aca02d 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -53,16 +53,17 @@ class Mailer < ActionMailer::Base recipients ||= [] course.members.each do |member| user = User.find(member.user_id) - # @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}" + @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}" @token = Token.get_token_from_user(user, 'autologin') @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value)) @anonymous_comment_close_name = homework_common.name @author = homework_common.user #收件人邮箱 + recipients << user.mail end mail :to => recipients, - :subject => "[#{l(:mail_homework)}#{homework_common.name}] #{l(:mail_anonymous_comment_open)}" + :subject => @subject end # 作业匿评关闭 @@ -71,7 +72,7 @@ class Mailer < ActionMailer::Base recipients ||= [] course.members.each do |member| user = User.find(member.user_id) - #@subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}" + @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_close)}" @token = Token.get_token_from_user(user, 'autologin') @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value)) @anonymous_comment_close_name = homework_common.name @@ -80,7 +81,7 @@ class Mailer < ActionMailer::Base recipients << user.mail end mail :to => recipients, - :subject => "[#{l(:mail_homework)}#{homework_common.name}] #{l(:mail_anonymous_comment_open)}" + :subject => @subject end # 匿评失败给老师发送邮件通知 @@ -89,19 +90,23 @@ class Mailer < ActionMailer::Base recipients ||= [] # 只给该课程的老师发送邮件提醒 course.members.each do |member| - if m.user.allowed_to?(:as_teacher,course) + if member.user.allowed_to?(:as_teacher,course) user = User.find(member.user_id) - #@subject = "[#{l(:mail_homework)} #{homework_common.name}] #{l(:mail_anonymous_comment_failed)}" + @subject = "[#{l(:mail_homework)} #{homework_common.name}] #{l(:mail_anonymous_comment_failed)}" @token = Token.get_token_from_user(user, 'autologin') @anonymous_comment_fail_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value)) @anonymous_comment_fail_name = homework_common.name @author = homework_common.user #收件人邮箱 + puts "######################" + puts homework_common.id + puts recipients + puts "######################" recipients << user.mail end end mail :to => recipients, - :subject => "[#{l(:mail_homework)} #{homework_common.name}] #{l(:mail_anonymous_comment_failed)}" + :subject => @subject end # author: alan diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake index 63640bbb5..6cf4dd6da 100644 --- a/lib/tasks/homework_evaluation.rake +++ b/lib/tasks/homework_evaluation.rake @@ -32,7 +32,7 @@ namespace :homework_evaluation do homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2) end # 邮件通知 - Mailer.send_mail_anonymous_comment_close(homework_common).deliver + Mailer.send_mail_anonymous_comment_open(homework_common).deliver else #作业数小于2，启动失败, 只给老师发 # status==4 发送失败 @@ -65,7 +65,10 @@ namespace :homework_evaluation do end homework_detail_manual.update_column('comment_status', 3) # 匿评关闭消息通知 给所有人发 - send_message_anonymous_comment(homework_common, 3) + course = homework_common.course + course.members.each do |m| + homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 3) + end # 邮件通知 Mailer.send_mail_anonymous_comment_close(homework_common).deliver end From f2b2062b9c3cc6de962daa507174cf016f55ee4f Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 29 Sep 2015 16:01:01 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E7=82=B9=E8=B5=9E?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=86=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_praise_tread.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/memos/_praise_tread.html.erb b/app/views/memos/_praise_tread.html.erb index 32b4a0ac0..5850cf50a 100644 --- a/app/views/memos/_praise_tread.html.erb +++ b/app/views/memos/_praise_tread.html.erb @@ -7,13 +7,13 @@ <% if @is_valuate.size > 0 %> <% @flag = @is_valuate.first.praise_or_tread %> <% if @flag == 1 %> - <%= get_praise_num(obj)%> + <%= get_praise_num(obj)%> <% end %> <% else %> <% if user_id == obj.author_id %> - <%= get_praise_num(obj)%> + <%= get_praise_num(obj)%> <% else %> From a3ce43c3d5c7ae8234b931e4e41050eca457927b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 29 Sep 2015 16:01:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8E=E6=88=91?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/news_controller.rb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index d5c248f77..5d83c1320 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -175,19 +175,19 @@ class NewsController < ApplicationController update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS end # ������ض�̬�ļ�¼add start - teachers = searchTeacherAndAssistant(@course) - for teacher in teachers - if(teacher.user_id != User.current.id) - notify = ActivityNotify.new() - notify.activity_container_id = @course.id - notify.activity_container_type = 'Course' - notify.activity_id = @news.id - notify.activity_type = 'News' - notify.notify_to = teacher.user_id - notify.is_read = 0 - notify.save() - end - end + # teachers = searchTeacherAndAssistant(@course) + # for teacher in teachers + # if(teacher.user_id != User.current.id) + # notify = ActivityNotify.new() + # notify.activity_container_id = @course.id + # notify.activity_container_type = 'Course' + # notify.activity_id = @news.id + # notify.activity_type = 'News' + # notify.notify_to = teacher.user_id + # notify.is_read = 0 + # notify.save() + # end + # end # ������ض�̬�ļ�¼add end render_attachment_warning_if_needed(@news) flash[:notice] = l(:notice_successful_create) From 3c01969db16ec49b0bd8142cbf57956782fbfad4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 16:06:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/prettify.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css index c7d16ffd4..2e750f076 100644 --- a/public/stylesheets/prettify.css +++ b/public/stylesheets/prettify.css @@ -75,3 +75,7 @@ li.L9 { background: #eee } /*.prettyprint .dec,*/ /*.prettyprint .var { color: #A6E22E; }*/ /*.prettyprint .pln { color: #66D9EF; }*/ +.memo-content pre { + white-space:pre !important; + word-wrap: break-word; +} \ No newline at end of file From 9d122886a92afbd4f4081270ae8e5c286009a558 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 16:10:43 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E4=BC=9A=E5=88=A0=E9=99=A4=E8=B4=B4=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index aaf5a5846..4224d0987 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -33,7 +33,7 @@ function del_confirm(){ if(confirm('确认删除么?')){ - $("#del_link").click(); + $("#del_memo_link").click(); }else{ } @@ -52,7 +52,7 @@