From d4d8a82e8b589886d571c3a0cca745b37dc051b0 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 Jan 2017 11:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E6=88=90=E5=91=98=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=9A=84=E5=AE=A1=E6=89=B9=E7=BB=93=E6=9E=9C=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=EF=BC=8C=E4=B8=8E=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=9C=80=E6=96=B0=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=96=B9=E5=BC=8F=E4=B8=80=E8=87=B4=EF=BC=8C=E8=AF=B7?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layouts/_show_messages_list.html.erb | 6 +-- .../users/_user_message_contest.html.erb | 53 ++++++++++++------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb index 557d96841..5362c50ed 100644 --- a/app/views/layouts/_show_messages_list.html.erb +++ b/app/views/layouts/_show_messages_list.html.erb @@ -83,8 +83,7 @@ <% content = User.find(ma.course_message_id).name+"申请成为班级\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "教辅"}" %>
  • 系统提示 您有了新的班级成员申请：<%=content %>
    • <% elsif ma.course_message_type == "CourseRequestDealResult" %> - <% content = ma.status == 1 ? '您申请成为班级"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为班级"'+Course.find(ma.course_id).name+'"的'+(ma.content && ma.content.include?('9') ? '教师' : '教辅')+'的申请被拒绝' %> -
  • 系统提示 班级申请进度反馈：<%=content %>
    • +
  • <%= User.find(ma.user_id).show_name%> 申请以“<%= ma.content.include?('9') ? '教师' : '教辅' %>”身份加入：<%=Course.find(ma.course_id).name %> <%=User.find(ma.course_message_id).show_name%><%=ma.status == 1 ? '已通过' : '已拒绝' %>
    • <% elsif ma.course_message_type == "JoinCourse" and ma.status == 0 %>
  • <%=User.find(ma.course_message_id).show_name %> 将您加入了班级：<%=ma.course.name %>
    • <% elsif ma.course_message_type == "JoinCourse" and ma.status == 1 %> @@ -120,6 +119,7 @@
  • <%= message_content(ma.contest_message.notes)%>"><%=ma.contest_message.user.show_name %> <%= ma.contest_message.m_parent_id.nil? ? "发布了竞赛留言：" : "回复了竞赛留言："%><%= message_content(ma.contest_message.notes)%>
    • <% end %> <% elsif ma.contest_message_type == "ContestRequestDealResult" %> + <% user = User.find(ma.user_id) %> <% if ma.content role_str = "" if ma.content.include?('13') && ma.content.include?('14') @@ -132,7 +132,7 @@ role_str = "参赛者" end end %> -
  • 系统提示 竞赛申请进度反馈：您申请成为竞赛"<%=Contest.find(ma.contest_id).name %>"的"<%=role_str %>"<%= ma.status == 1 ? "申请已通过" : "的申请被拒绝"%>
    • +
  • <%= user.show_name%> <%= user.user_extensions.school_id.blank? ? "" : "来自"+user.user_extensions.school.name+"，" %>申请以"<%= role_str%>"的身份加入竞赛：<%=Contest.find(ma.contest_id).name %> <%= User.find(ma.contest_message_id).show_name %><%= ma.status == 1 ? "已同意" : "已拒绝"%>
    • <% elsif ma.contest_message_type == "JoinContest" and ma.status == 0 %>
  • <%=User.find(ma.contest_message_id).show_name %> 将您加入了竞赛：<%= ma.contest.name%>
    • <% elsif ma.contest_message_type == "JoinContest" and ma.status == 1 %> diff --git a/app/views/users/_user_message_contest.html.erb b/app/views/users/_user_message_contest.html.erb index 9cb1e3fe1..3149ea8b7 100644 --- a/app/views/users/_user_message_contest.html.erb +++ b/app/views/users/_user_message_contest.html.erb @@ -1,35 +1,48 @@ <% if ma.class == ContestMessage %> <% if ma.contest_message_type == "ContestRequestDealResult" %> + <% user = User.find(ma.user_id) %> + <% if ma.content + role_str = "" + if ma.content.include?('13') && ma.content.include?('14') + role_str = "管理员、评委" + elsif ma.content.include?('13') + role_str = "管理员" + elsif ma.content.include?('14') + role_str = "评委" + elsif ma.content.include?('15') + role_str = "参赛者" + end + end %>