From aaf97ac81c2618a9ff54532a65db51aa309e1950 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 5 May 2016 09:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=9D=973=E5=92=8C=E6=9D=BF?= =?UTF-8?q?=E5=9D=972=E5=90=88=E5=B9=B6=EF=BC=8C=E6=9D=BF=E5=9D=973?= =?UTF-8?q?=E5=8F=96=E5=89=8D=E5=9B=9B=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 3 +-- app/views/organizations/_org_subfield_leftM2.html.erb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 3fe002539..2de929f72 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -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} %>
<%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %> - <% elsif field.status.to_i == 3 %> <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
diff --git a/app/views/organizations/_org_subfield_leftM2.html.erb b/app/views/organizations/_org_subfield_leftM2.html.erb index 64e104745..324027c1c 100644 --- a/app/views/organizations/_org_subfield_leftM2.html.erb +++ b/app/views/organizations/_org_subfield_leftM2.html.erb @@ -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) %>