From f4b4bf40ded56a0e892fbb4071328be7517530d4 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Mar 2016 11:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=98=BE=E7=A4=BA=E6=A8=A1=E5=BC=8F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=9C=A8=E6=96=B0=E5=BB=BA=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=92=8C=E9=85=8D=E7=BD=AE=E7=BB=84=E7=BB=87=E4=B8=AD?=
 =?UTF-8?q?=E8=83=BD=E5=A4=9F=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb        |  2 ++
 app/views/organizations/new.html.erb               |  7 +++++++
 app/views/organizations/setting.html.erb           | 14 ++++++++++++++
 ...22312_add_coulumn_show_mode_to_organizations.rb |  5 +++++
 ...160328022623_set_show_mode_for_organizations.rb | 12 ++++++++++++
 5 files changed, 40 insertions(+)
 create mode 100644 db/migrate/20160328022312_add_coulumn_show_mode_to_organizations.rb
 create mode 100644 db/migrate/20160328022623_set_show_mode_for_organizations.rb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index da0eb8009..80f196ba5 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -56,6 +56,7 @@ class OrganizationsController < ApplicationController
     @organization.description = params[:organization][:description]
     @organization.is_public = params[:organization][:is_public]
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == '1' ? 1 : 0
+    @organization.show_mode = params[:show_mode]
     @organization.creator_id = User.current.id
     member = OrgMember.new(:user_id => User.current.id)
 
@@ -120,6 +121,7 @@ class OrganizationsController < ApplicationController
     # @organization.domain = params[:organization][:domain]
     @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == 'on' ? 1 : 0
+    @organization.show_mode = params[:show_mode]
     #@organization.name = params[:organization][:name]
     @organization.save
      respond_to do |format|
diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb
index b0c961d82..efe481b77 100644
--- a/app/views/organizations/new.html.erb
+++ b/app/views/organizations/new.html.erb
@@ -28,6 +28,13 @@
                              value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %>
           </p>
         </li>
+        <li class=" mb5 ml45">
+          <span style="margin-left:10px;" >显示模式&nbsp;&nbsp;&nbsp;&nbsp;: </span>
+          <input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:2px;" checked />
+          <label for="show_mode_ordinary">社区模式一</label>
+          <input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" />
+          <label for="show_mode_special">社区模式二</label>
+        </li>
         <li class=" mb5 ml80">
           <label >公开&nbsp;&nbsp;：</label>
           <input id="organization_is_public" name="organization[is_public]" onclick="disable_down($(this), $('#organization_alow_download'), $('#allow_down_hint'));" type="checkbox" value="1" checked="checked">
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index c0ca2cfe4..b11e5a780 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -72,6 +72,20 @@
           <!--class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 -->
         </div>
         <div class="cl"></div>
+        <div class="orgRow mb10 mt5">
+          <span style="margin-left:10px;" >显示模式&nbsp;: </span>
+          <% if @organization.show_mode == 0 %>
+              <input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:5px;" checked />
+              <label for="show_mode_ordinary">社区模式一</label>
+              <input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" />
+              <label for="show_mode_special">社区模式二</label>
+          <% else %>
+              <input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:5px;" />
+              <label for="show_mode_ordinary">社区模式一</label>
+              <input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" checked />
+              <label for="show_mode_special">社区模式二</label>
+          <% end %>
+        </div>
         <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
           <input type="checkbox" id="is_public" onclick="disable_down($(this), $('#allow_download'),$('#allow_down_hint'));"  name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
         </div>
diff --git a/db/migrate/20160328022312_add_coulumn_show_mode_to_organizations.rb b/db/migrate/20160328022312_add_coulumn_show_mode_to_organizations.rb
new file mode 100644
index 000000000..11f3fa22e
--- /dev/null
+++ b/db/migrate/20160328022312_add_coulumn_show_mode_to_organizations.rb
@@ -0,0 +1,5 @@
+class AddCoulumnShowModeToOrganizations < ActiveRecord::Migration
+  def change
+    add_column :organizations, :show_mode, :integer, :default => 0
+  end
+end
diff --git a/db/migrate/20160328022623_set_show_mode_for_organizations.rb b/db/migrate/20160328022623_set_show_mode_for_organizations.rb
new file mode 100644
index 000000000..719dfc1ff
--- /dev/null
+++ b/db/migrate/20160328022623_set_show_mode_for_organizations.rb
@@ -0,0 +1,12 @@
+class SetShowModeForOrganizations < ActiveRecord::Migration
+  def up
+    Organization.transaction do
+      Organization.all.each do |org|
+        org.update_attribute(:show_mode, 0)
+      end
+    end
+  end
+
+  def down
+  end
+end