diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb index 82dae65bb..4545b16e7 100644 --- a/app/views/student_work/_evaluation_un_group_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_work.html.erb @@ -14,28 +14,31 @@
关联项目:
- <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? || User.current.allowed_to?(:as_teacher, @homework.course) %> + <% if student_work.project.status != 9 && (student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? || User.current.allowed_to?(:as_teacher, @homework.course)) %> <%= link_to student_work.project.name, project_path(student_work.project.id), :class => 'link-blue fl hidden', :style => "max-width:550px;", :title => "项目名称", :target => "_blank" %> - <% else %> + <% elsif student_work.project.status != 9 %> - <% end %> + <% else %> + <% end %> <% project = student_work.project %>
-

<%= project.name %>

+

<%= project.name %><%= project.status == 9 ? "(已删除)" : ""%>

创建者:<%= project.creater %>成员数量:<%= project.members.count %>

<% project_score = project.project_score %> -

项目综合得分:<%= static_project_score(project_score).to_i %>

+

项目综合得分:<%= project.status == 9 ? 0 : static_project_score(project_score).to_i %>

+ <% if project.status != 9 %>

= 代码提交得分 + issue得分 + 资源得分 + 帖子得分

= <%= (project_score.changeset_num||0) * 4 %> + <%= project_score.issue_num * 4 + project_score.issue_journal_num %> + <%= project_score.attach_num * 5 %> + <%= project_score.board_num * 2 + project_score.board_message_num + project_score.news_num %>

+ <% end %>
diff --git a/app/views/student_work/_relate_projects.html.erb b/app/views/student_work/_relate_projects.html.erb index 8b977b47a..b538d2aa6 100644 --- a/app/views/student_work/_relate_projects.html.erb +++ b/app/views/student_work/_relate_projects.html.erb @@ -1,13 +1,15 @@
<% projects.each do |project|%> - <% allow_visit = project.is_public || User.current.member_of?(project) || User.current.admin? || User.current.allowed_to?(:as_teacher, @homework.course) %> + <% allow_visit = project.status != 9 && (project.is_public || User.current.member_of?(project) || User.current.admin? || User.current.allowed_to?(:as_teacher, @homework.course)) %>

<% if allow_visit %> <%= link_to "#{project.name}", project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "new_project_title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目:":"私有项目:") + project.name%> - <% else %> + <% elsif project.status != 9 %> <%=project.name %> + <% else %> + <%=project.name %> <% end %>

<%= project.is_public? ? '公开' : '私有' %>