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

解决冲突

This commit is contained in:
huang 2016-05-06 10:39:37 +08:00
parent aefcb78926
commit c3a016607b
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/helpers/organizations_helper.rb
View File

@ -63,7 +63,7 @@ module OrganizationsHelper
def subfield_status_option
type = []
option1 = []
option1 << "左上"
option1 << "左一"
option1 << "1"
type << option1
# option2 = []
@ -71,27 +71,27 @@ module OrganizationsHelper
# option2 << "2"
# type << option2
option3 = []
option3 << "中上"
option3 << "左二"
option3 << "3"
type << option3
option4 = []
option4 << "中下"
option4 << "左三"
option4 << "4"
type << option4
option5 = []
option5 << "左下"
option5 << "左四"
option5 << "5"
type << option5
option6 = []
option6 << "右上"
option6 << "右一"
option6 << "6"
type << option6
option7 = []
option7 << "右中"
option7 << "右二"
option7 << "7"
type << option7
option8 = []
option8 << "右下"
option8 << "右三"
option8 << "8"
type << option8
type
@ -101,19 +101,19 @@ module OrganizationsHelper
def subfield_status_option_default
type = []
option1 = []
option1 << "左上"
option1 << "左一"
option1 << "1"
type << option1
option3 = []
option3 << "中上"
option3 << "左二"
option3 << "3"
type << option3
option4 = []
option4 << "中下"
option4 << "左三"
option4 << "4"
type << option4
option6 = []
option6 << "右上"
option6 << "右一"
option6 << "6"
type << option6
type
@ -122,21 +122,21 @@ module OrganizationsHelper
def subfield_list_type subfield
case subfield.to_i
when 1
resulet = "左上"
resulet = "左一"
when 2
resulet = "中一"
resulet = "左二"
when 3
resulet = "中二"
resulet = "左二"
when 4
resulet = "中下"
resulet = "左三"
when 5
resulet = "左下"
resulet = "左四"
when 6
resulet = "右上"
resulet = "右一"
when 7
resulet = "右中"
resulet = "右二"
when 8
resulet = "右下"
resulet = "右三"
end
end

6
app/views/organizations/_subfield_list.html.erb
View File

@ -28,11 +28,11 @@
默认
<% else %>
<%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
<div class="update_status_class"><span class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
<div class="update_status_class"><span class="hidden"><%= subfield_list_type(field.status) %></span>
<a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
</div>
<%= select( :name,:group_id, subfield_status_option_default, { :include_blank => false,:selected => field.status},
{ :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
{ :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
<% end %>
<% end %>
@ -63,7 +63,7 @@
列表
<% else %>
<%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
<div class="update_status_class"><span class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
<div class="update_status_class"><span class="hidden"><%= subfield_list_type(field.status) %></span>
<a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
</div>
<%= select( :name,:group_id, subfield_status_option,