From 61f99137fc2f934b1a0158fda38be6db8916a73e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 23 Sep 2016 10:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=8A=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb          | 13 ++-----------
 db/migrate/20160923024443_change_poroject_type.rb |  9 +++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 db/migrate/20160923024443_change_poroject_type.rb

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index e4f9dbd58..385d936f2 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -48,7 +48,6 @@
 
   <div id="content">
     <%= render :partial => 'layouts/base_project_top' %>
-    <!--<div class=" fl mr10" style="width:240px; height:800px;background:#ddd;"></div>-->
 
     <div id="LSide" class="fl">
       <div class="project_info">
@@ -70,9 +69,7 @@
         </div>
         <!--关注、申请加入/退出项目-->
         <div id="join_exit_project_div">
-          <% text = @project.project_new_type == 1 ? l(:label_development_team) : (@project.project_new_type == 2 ? l(:label_research_group) : l(:label_friend_organization))%>
-          <% typeclass = @project.project_new_type == 1 ? "pr_kafa" : (@project.project_new_type == 2 ? "pr_keyan" : "pr_friend")%>
-          <%= render 'layouts/join_exit_project',{:text => text, :typeclass => typeclass} %>
+          <%= render 'layouts/join_exit_project' %>
         </div>
         <!-- 项目得分 -->
         <div class="cl"></div>
@@ -119,13 +116,7 @@
       <!--邀请加入-->
       <div class="subNavBox">
         <div id="project_memu_list">
-          <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
-            <%= render :partial => 'projects/development_group', :locals => {:project => @project} %>
-          <% elsif @project.project_new_type == 2 %>
-            <%= render :partial => 'projects/research_team', :locals => {:project => @project} %>
-          <% else %>
-            <%= render :partial => 'projects/friend_group', :locals => {:project => @project} %>
-          <% end %>
+          <%= render :partial => 'projects/development_group', :locals => {:project => @project} %>
         </div>
 
         <!-- end -->
diff --git a/db/migrate/20160923024443_change_poroject_type.rb b/db/migrate/20160923024443_change_poroject_type.rb
new file mode 100644
index 000000000..d092f87e6
--- /dev/null
+++ b/db/migrate/20160923024443_change_poroject_type.rb
@@ -0,0 +1,9 @@
+class ChangePorojectType < ActiveRecord::Migration
+  def up
+    projects = Project.where("project_new_type !=?", 1)
+    projects.update_all(:project_new_type => 1)
+  end
+
+  def down
+  end
+end