diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e05d83ce1..5f40afdba 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3089,12 +3089,12 @@ module ApplicationHelper else link_to "补交作品(#{count})", new_contestant_work_path(:work => homework.id),:class => 'c_red' end + else + if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id + link_to "修改作品(#{count})", edit_contestant_work_path(work.id),:class => 'c_blue' else - if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id - link_to "修改作品(#{count})", edit_contestant_work_path(work.id),:class => 'c_blue' - else - link_to "查看作品(#{count})", contestant_works_path(:work =>homework.id, :tab => 2), :class => 'c_blue', :title => "作业截止后不可修改作品" - end + link_to "查看作品(#{count})", contestant_works_path(:work =>homework.id, :tab => 2), :class => 'c_blue', :title => "不可修改作品" + end end end else diff --git a/app/views/contestant_works/_contest_evaluation_un_work.html.erb b/app/views/contestant_works/_contest_evaluation_un_work.html.erb index 19896fa2c..163e87f40 100644 --- a/app/views/contestant_works/_contest_evaluation_un_work.html.erb +++ b/app/views/contestant_works/_contest_evaluation_un_work.html.erb @@ -3,7 +3,7 @@ <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_path(student_work.user), :target => '_blank') %> - + <%= link_to student_work.user.show_name ,user_path(student_work.user), :target => '_blank' %> diff --git a/app/views/contestant_works/_work_edit_information.html.erb b/app/views/contestant_works/_work_edit_information.html.erb index 3be9f2dae..e3e0227f7 100644 --- a/app/views/contestant_works/_work_edit_information.html.erb +++ b/app/views/contestant_works/_work_edit_information.html.erb @@ -1,7 +1,7 @@
请您确认刚刚上传的作品信息 -

+

作品名称:<%=@student_work.name%>

diff --git a/app/views/contestant_works/_work_information.html.erb b/app/views/contestant_works/_work_information.html.erb index a11bbbc9a..07ce89a09 100644 --- a/app/views/contestant_works/_work_information.html.erb +++ b/app/views/contestant_works/_work_information.html.erb @@ -1,7 +1,7 @@
请您确认刚刚上传的作品信息 -

+

作品名称:<%=@student_work.name%>

diff --git a/app/views/users/_work_opr.html.erb b/app/views/users/_work_opr.html.erb index 3ded16ba6..e35ff1de2 100644 --- a/app/views/users/_work_opr.html.erb +++ b/app/views/users/_work_opr.html.erb @@ -3,7 +3,7 @@ <% projects = cur_user_projects_for_work activity %> <% if work.nil? && projects.nil? %>
- <%=link_to "关联项目",new_student_work_project_contestant_works_path(:work => activity.id,:hw_status=>hw_status,:user_activity_id=>user_activity_id),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %> + <%=link_to "关联项目",new_student_work_project_contestant_works_path(:work => activity.id,:hw_status=>hw_status,:user_activity_id=>user_activity_id),remote: true,:class=> 'c_blue', :title=> '请各组长关联项目' %>
<% elsif work.nil? %>