From b213cd7546823b42d27683d0d7c038a98d7efe74 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 27 Mar 2017 14:47:54 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=BF=80=E6=B4=BB?= =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=8F=90=E7=A4=BA=E9=A1=B5=E4=B8=8E=E6=9C=AA?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E6=B0=B8=E8=BE=89=E7=99=BB=E5=BD=95=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E7=9A=84=E7=95=99=E8=A8=80=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/email_valid.html.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb index e850d96c2..f0a91069a 100644 --- a/app/views/account/email_valid.html.erb +++ b/app/views/account/email_valid.html.erb @@ -18,8 +18,8 @@
  • 请注意查看邮箱中的“订阅邮件”、“垃圾邮件”，可能Trustie的邮件被误杀了
  • 请点击重新发送激活邮件按钮
  • 如果重发注册验证邮箱邮件仍然没有收到，请更换邮箱地址，重新发送激活邮件
    • -
  • 如果您始终无法收到激活邮件，请直接给我们留言：
    • -
    +
  • 如果您始终无法收到激活邮件，请直接给我们留言
    • +
    @@ -36,6 +36,9 @@ url: "<%= change_user_email_user_path(@user) %>" }); }); + $("#leave_message").click(function(){ + $("#message_box").toggle(); + }) }); From c5826a04a21c4854a756af2a50dc1e14783151f7 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 27 Mar 2017 15:07:49 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=BF=80=E6=B4=BB=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=9B=B4=E6=8D=A2=E9=82=AE=E7=AE=B1=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E5=90=8E=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E9=A9=AC=E4=B8=8A=E7=BB=99=E6=96=B0=E7=9A=84=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=8F=91=E9=80=81=E6=BF=80=E6=B4=BB=E9=82=AE?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/_change_user_email.html.erb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/account/_change_user_email.html.erb b/app/views/account/_change_user_email.html.erb index 20eae1374..519ffb8a5 100644 --- a/app/views/account/_change_user_email.html.erb +++ b/app/views/account/_change_user_email.html.erb @@ -59,13 +59,18 @@ if($mail_correct == false){ return }else{ + // 改变邮箱地址 $.get('<%= account_change_email_path(:user_id => @user.id) %>', { valid: "mail", value: document.getElementById("user_mail").value }, function (data){ - $("#user_email_show").html(data.email); - hideModal(); - return; + $("#user_email_show").html(data.email); + // 更改邮箱地址后，直接给用户发送邮件 + $.ajax({ + url: "<%= resendmail_path(:user => @user) %>" + }); + hideModal(); + return; }); } } From e55ccb9e91c8651e9b1156a9741e95e3a7e94762 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 29 Mar 2017 09:19:43 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=89=88500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_applide_action.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_applide_action.html.erb b/app/views/users/_user_message_applide_action.html.erb index 21afe7122..3eb015b37 100644 --- a/app/views/users/_user_message_applide_action.html.erb +++ b/app/views/users/_user_message_applide_action.html.erb @@ -8,7 +8,7 @@ 已处理 <% elsif ma.status == 4 %> <% operator_message = AppliedMessage.where("applied_id=? and user_id=? and status = 4", ma.applied_id, ma.user_id).first %> - <% operator = User.find(operator_message.applied_user_id).show_name %> + <% operator = User.find(operator_message.applied_user_id).try(:show_name) %> <%= operator %>已拒绝 From 309cd0600970bb385321fbe442e4a47968ddeb51 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 29 Mar 2017 09:29:25 +0800 Subject: [PATCH 4/9] =?UTF-8?q?500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_applide_action.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_applide_action.html.erb b/app/views/users/_user_message_applide_action.html.erb index 3eb015b37..000e7aa2b 100644 --- a/app/views/users/_user_message_applide_action.html.erb +++ b/app/views/users/_user_message_applide_action.html.erb @@ -14,7 +14,7 @@ <% elsif ma.status == 5 %> <% operator_message = AppliedMessage.where("applied_id=? and user_id=? and status = 4", ma.applied_id, ma.applied_user_id).first %> - <% operator = User.find(operator_message.applied_user_id).show_name %> + <% operator = User.find(operator_message.applied_user_id).try(:show_name) %> <%= operator %>已拒绝 From 03553fb2ebe567a48bc3fffc025269c274cd751a Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 29 Mar 2017 09:31:37 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=89=BE=E5=87=BA=E7=81=AB=E7=8B=90?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8KE=E5=A4=8D=E5=88=B62=E5=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/kindeditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index c5f8cf99f..0ade4b65e 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -6079,7 +6079,7 @@ _plugin('core', function(K) { // if (imglist.length > 0){ // df(self); // } - self.insertHtml(html, true); + self.insertHtml(html, true); // 火狐浏览器复制图片会出现2个 df(self); } K(doc.body).bind('paste', function(e){ From 8f8fc6200ca33b093db94003da2cd99b041f96cd Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 29 Mar 2017 09:34:39 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=AB=98=E6=A0=A1?= =?UTF-8?q?=E6=B6=88=E6=81=AF500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_applide_action.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_applide_action.html.erb b/app/views/users/_user_message_applide_action.html.erb index 000e7aa2b..1b2730ad5 100644 --- a/app/views/users/_user_message_applide_action.html.erb +++ b/app/views/users/_user_message_applide_action.html.erb @@ -12,7 +12,7 @@ <%= operator %>已拒绝 -<% elsif ma.status == 5 %> +<% elsif ma.status == 5 && !AppliedMessage.where("applied_id=? and user_id=? and status = 4", ma.applied_id, ma.applied_user_id).first.nil? %> <% operator_message = AppliedMessage.where("applied_id=? and user_id=? and status = 4", ma.applied_id, ma.applied_user_id).first %> <% operator = User.find(operator_message.applied_user_id).try(:show_name) %> From 1dcaef2ce7036ff4c9ba115c5caccff6338a7e9b Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 31 Mar 2017 14:25:54 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E7=AC=A6=E9=9B=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_programing_work_show.html.erb | 2 +- app/views/users/new_user_commit_homework.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb index 08d48509a..920f42131 100644 --- a/app/views/student_work/_programing_work_show.html.erb +++ b/app/views/student_work/_programing_work_show.html.erb @@ -52,7 +52,7 @@
    <% if test.status.to_i == -2 %>
    - <%= test.results.first %> + <%= test.results.first.to_s.force_encoding("UTF-8") %>
    <% else %>
    diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb index 399eb4aae..3ac20f468 100644 --- a/app/views/users/new_user_commit_homework.html.erb +++ b/app/views/users/new_user_commit_homework.html.erb @@ -147,7 +147,7 @@
    <% if test.status.to_i == -2 %> - 
    <%= test.results.first %>
    + 
    <%= test.results.first.to_s.force_encoding("UTF-8") %>
    <% else %>
    - <% if @syllabus.courses.not_deleted.empty? %> + <% if @status == 1 %> 确认删除该课程吗？ + <% elsif @status == 2 %> + 该课程下存在归档班级，不能删除。 <% else %> 该课程下已经存在班级，不能删除。 <% end %>
    - <% if @syllabus.courses.not_deleted.empty? %> + <% if @status == 1 %> 取消 <%=link_to '确认', syllabus_path(@syllabus), :class => 'sy_btn_blue fl', :method => 'delete'%> <% else %> From f6c38be83f228aaa496b3001ca928fe78999a4b9 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 31 Mar 2017 15:08:55 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E4=B8=AD=E4=B8=BA=E9=9D=9E=E6=B1=89=E5=AD=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E4=B8=94=E9=95=BF=E5=BA=A6=E5=A4=9F=E9=95=BF=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E5=9B=BE=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA=E8=BE=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/contests/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/contests/show.html.erb b/app/views/contests/show.html.erb index 408088396..9a7ca49ac 100644 --- a/app/views/contests/show.html.erb +++ b/app/views/contests/show.html.erb @@ -19,7 +19,7 @@

    尚未发布竞赛说明，敬请期待~

    <% else %>
    -
    +
    <%= @contest.description.html_safe %>