From a0ea2c7e5d5211c8c5d33359045af2e1759c416f Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 5 May 2016 10:05:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=BA=8C3=E5=9C=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/organizations_helper.rb | 16 ++++++---------- .../organizations/_org_subfield_leftM2.html.erb | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index a43890c90..2eb4658c5 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -66,12 +66,12 @@ module OrganizationsHelper option1 << "左上" option1 << "1" type << option1 - option2 = [] - option2 << "中一" - option2 << "2" - type << option2 + # option2 = [] + # option2 << "中一" + # option2 << "2" + # type << option2 option3 = [] - option3 << "中二" + option3 << "中上" option3 << "3" type << option3 option4 = [] @@ -104,12 +104,8 @@ module OrganizationsHelper option1 << "左上" option1 << "1" type << option1 - option2 = [] - option2 << "中一" - option2 << "2" - type << option2 option3 = [] - option3 << "中二" + option3 << "中上" option3 << "3" type << option3 option4 = [] diff --git a/app/views/organizations/_org_subfield_leftM2.html.erb b/app/views/organizations/_org_subfield_leftM2.html.erb index 324027c1c..8dc510a7c 100644 --- a/app/views/organizations/_org_subfield_leftM2.html.erb +++ b/app/views/organizations/_org_subfield_leftM2.html.erb @@ -86,7 +86,7 @@ <% if @project_acts.blank? %> <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %> <% else %> - <% @project_acts.first(4).each do |act| %> + <% @project_acts[1..4].each do |act| %> <% if act.org_act_type == "Issue" %> <% activity = Issue.find(act.org_act_id) %> <% iamge_path = get_image_path_from_content(activity.description) %> @@ -146,7 +146,7 @@ <% if org_acts.blank? %> <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %> <% else %> - <% org_acts.first(4).each do |activity| %> + <% org_acts[1..4].each do |activity| %> <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> <% document = activity.org_act %> <% org_subfield_id = params[:org_subfield_id] %>