jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

新版块3和板块2合并，板块3取前四个

This commit is contained in:
huang 2016-05-05 09:45:34 +08:00
parent 06e90c83e4
commit aaf97ac81c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/layouts/base_org2.html.erb
View File

@ -146,11 +146,10 @@
<% @subfield_content.each do |field| %>
<% if field.status.to_i == 1 %>
<%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
<% elsif field.status.to_i == 2 %>
<% elsif field.status.to_i == 3 %>
<%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
<%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
<% elsif field.status.to_i == 3 %>
<%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
<div class="cl"></div>
</div>

2
app/views/organizations/_org_subfield_leftM2.html.erb
View File

@ -5,7 +5,7 @@
<% if @course_acts.blank? %>
<%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
<% else %>
<% @course_acts.first(4).each do |act| %>
<% @course_acts[1..4].each do |act| %>
<% if act.org_act_type == "HomeworkCommon" %>
<% activity = HomeworkCommon.find(act.org_act_id) %>
<% iamge_path = get_image_path_from_content(activity.description) %>