模式二3在配置整合

beidou_tim
huang 9 years ago
parent 18dff4f8a3
commit a0ea2c7e5d

@ -66,12 +66,12 @@ module OrganizationsHelper
option1 << "左上" option1 << "左上"
option1 << "1" option1 << "1"
type << option1 type << option1
option2 = [] # option2 = []
option2 << "中一" # option2 << "中一"
option2 << "2" # option2 << "2"
type << option2 # type << option2
option3 = [] option3 = []
option3 << "" option3 << ""
option3 << "3" option3 << "3"
type << option3 type << option3
option4 = [] option4 = []
@ -104,12 +104,8 @@ module OrganizationsHelper
option1 << "左上" option1 << "左上"
option1 << "1" option1 << "1"
type << option1 type << option1
option2 = []
option2 << "中一"
option2 << "2"
type << option2
option3 = [] option3 = []
option3 << "" option3 << "中上"
option3 << "3" option3 << "3"
type << option3 type << option3
option4 = [] option4 = []

@ -86,7 +86,7 @@
<% if @project_acts.blank? %> <% if @project_acts.blank? %>
<%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %> <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
<% else %> <% else %>
<% @project_acts.first(4).each do |act| %> <% @project_acts[1..4].each do |act| %>
<% if act.org_act_type == "Issue" %> <% if act.org_act_type == "Issue" %>
<% activity = Issue.find(act.org_act_id) %> <% activity = Issue.find(act.org_act_id) %>
<% iamge_path = get_image_path_from_content(activity.description) %> <% iamge_path = get_image_path_from_content(activity.description) %>
@ -146,7 +146,7 @@
<% if org_acts.blank? %> <% if org_acts.blank? %>
<%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %> <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
<% else %> <% 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 %> <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
<% document = activity.org_act %> <% document = activity.org_act %>
<% org_subfield_id = params[:org_subfield_id] %> <% org_subfield_id = params[:org_subfield_id] %>

Loading…
Cancel
Save