From 638280a07e32b0931a1e9ad7b64763c76ea4784d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 1 Apr 2016 10:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_subfield_list.html.erb     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 4fbeb971f..2c679eb3d 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -23,14 +23,19 @@
           <li class="orgListUser"><%= name %></li>
           <li class="orgListStatus">默认</li>
           <li class="orgListStatusList">
-            <%= 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>
-                  <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
-                </div>
-                <%= select( :name,:group_id, subfield_status_option,
-                            { :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;"}) %>
+            <% if field.name == "activity" %>
+             默认
+            <% 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>
+                      <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
+                    </div>
+                    <%= select( :name,:group_id, subfield_status_option,
+                                { :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;"}) %>
+                <% end %>
             <% end %>
+
           </li>
           <li class="orgListStatus">默认</li>
           <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>