Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
5bae0b674c
|
@ -66,7 +66,7 @@ module ApiHelper
|
||||||
(user.language.nil? || user.language == "") ? 'zh':user.language
|
(user.language.nil? || user.language == "") ? 'zh':user.language
|
||||||
end
|
end
|
||||||
|
|
||||||
# 获取课程作业的状态
|
# 学生获取课程作业的状态
|
||||||
def get_homework_status homework
|
def get_homework_status homework
|
||||||
homework_status = ""
|
homework_status = ""
|
||||||
if !homework.nil?
|
if !homework.nil?
|
||||||
|
@ -75,9 +75,9 @@ module ApiHelper
|
||||||
when 1
|
when 1
|
||||||
homework_status = show_homework_deadline homework
|
homework_status = show_homework_deadline homework
|
||||||
when 2
|
when 2
|
||||||
homework_status = "正在匿评中"
|
homework_status = "正在匿评"
|
||||||
when 3
|
when 3
|
||||||
homework_status = "匿评已结束"
|
homework_status = "匿评结束"
|
||||||
end
|
end
|
||||||
elsif homework.homework_type == 0
|
elsif homework.homework_type == 0
|
||||||
homework_status = "未启用匿评"
|
homework_status = "未启用匿评"
|
||||||
|
|
Loading…
Reference in New Issue