Merge branch 'develop' into szzh
This commit is contained in:
commit
2e70d0d167
|
@ -96,14 +96,14 @@
|
|||
<%= image_tag(url_to_avatar(@project), :class => 'avatar2') %>
|
||||
</td>
|
||||
<td>
|
||||
<% project_score = format("%.2f" ,project_scores(@project)).to_i%>
|
||||
<div class="info-course">
|
||||
<%= link_to @project.name, project_path(@project)%>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
<% if @project.project_type == 0 %>
|
||||
<% if @project.project_type == 0 && project_score != 0 %>
|
||||
<%= l(:label_project_grade)%> :
|
||||
<%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects',
|
||||
<%= link_to(project_score, {:controller => 'projects',
|
||||
:action => 'show_projects_score',
|
||||
:remote => true,
|
||||
:id => @project.id
|
||||
|
|
Loading…
Reference in New Issue