Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
This commit is contained in:
commit
b944a4a5c6
|
@ -15,7 +15,7 @@ alert("班级已过期\n请联系班级管理员重启班级。(在配置班级
|
||||||
alert("您已经加入了班级");
|
alert("您已经加入了班级");
|
||||||
window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
|
window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
|
||||||
<% elsif @state == 4 %>
|
<% elsif @state == 4 %>
|
||||||
alert("您加入的班级不存在");
|
alert("您输入的邀请码错误");
|
||||||
<% elsif @state == 5 %>
|
<% elsif @state == 5 %>
|
||||||
alert("您还未登录");
|
alert("您还未登录");
|
||||||
<% elsif @state == 6 %>
|
<% elsif @state == 6 %>
|
||||||
|
|
Loading…
Reference in New Issue