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) %>