From c91ef44570f7941f759a82bfbdb3d87dab1f67ac Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 23 Feb 2016 12:52:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=AD=90=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=EF=BC=9A=E6=89=80=E6=9C=89=E5=AD=90=E5=9F=9F=E5=90=8D=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=88=B0secdomains=E8=A1=A8=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=AD=90=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D=E8=BF=81=E7=A7=BB=E5=88=B0secdomains=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb        |  3 ++-
 app/controllers/organizations_controller.rb        |  9 +++++++--
 app/views/organizations/_subfield_list.html.erb    |  2 +-
 app/views/organizations/setting.html.erb           | 11 ++++++-----
 app/views/users/user_organizations.html.erb        |  5 -----
 .../20160223021012_add_index_to_secdomain.rb       |  5 +++++
 .../20160223021227_move_domain_to_secdomain.rb     | 14 ++++++++++++++
 ...60223031843_remove_domain_from_organizations.rb |  8 ++++++++
 db/schema.rb                                       |  9 +++++++--
 9 files changed, 50 insertions(+), 16 deletions(-)
 create mode 100644 db/migrate/20160223021012_add_index_to_secdomain.rb
 create mode 100644 db/migrate/20160223021227_move_domain_to_secdomain.rb
 create mode 100644 db/migrate/20160223031843_remove_domain_from_organizations.rb

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index bae0232a5..2a4bcf9c8 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -30,7 +30,8 @@ class OrgSubfieldsController < ApplicationController
     if params[:id]
       @organization = Organization.find(params[:id])
     else
-      @organization = Organization.where("domain=?",request.subdomain).first
+      domain = Secdomain.where("subname=?", request.subdomain).first
+      @organization = Organization.find(domain.pid)
     end
     @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
         "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 6e2da311f..f225e7f50 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -139,7 +139,7 @@ class OrganizationsController < ApplicationController
   end
 
   def check_uniq_domain
-    @is_exist = (Organization.where("domain=?", params[:org_domain]).count > 0)
+    @is_exist = (Secdomain.where("subname=?",params[:org_domain]).count > 0)
   end
 
   def find_organization
@@ -322,7 +322,12 @@ class OrganizationsController < ApplicationController
   def agree_apply_subdomain
     @organization = Organization.find(params[:organization_id])
     OrgMessage.find(params[:act_id]).update_attribute(:viewed, 1)
-    @organization.update_attribute(:domain, params[:org_domain])
+    if Secdomain.where("pid=? and sub_type=2",@organization.id).count > 0
+      domain = Secdomain.where("pid=? and sub_type=2",params[:organization_id]).first
+      Secdomain.update(domain.id, :subname => params[:org_domain])
+    else
+      Secdomain.create(:sub_type => 2, :pid => params[:organization_id], :subname => params[:org_domain])
+    end
     if OrgMessage.where("message_type='AgreeApplySubdomain' and organization_id=#{@organization.id} and content=?",params[:org_domain]).count == 0
       OrgMessage.create(:user_id => params[:user_id], :organization_id => @organization.id, :message_type => 'AgreeApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:org_domain])
     end
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index b49436d4e..eed0dabf6 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -28,7 +28,7 @@
       <li class="orgListStatus">新增</li>
       <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
       <li class="orgListUser hidden">
-        <% if @organization.domain %>
+        <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
             <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
               <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
             </div>
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index f2e4d5631..146e643a0 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -27,6 +27,7 @@
         }
 
 </script>
+<% domain = Secdomain.where("sub_type=2 and pid=?", @organization.id).first %>
     <div class="homepageRightBanner">
       <div class="NewsBannerName">配置</div>
     </div>
@@ -53,12 +54,12 @@
         <div class="orgRow mb10"><span class="ml10">组织描述：</span><textarea type="text" name="organization[description]" class="orgDes" id="org_desc"  placeholder="最多3000个汉字（或6000个英文字符）"><%= @organization.description%></textarea>
           <div class="cl"></div>
         </div>
-            <div style="margin-left: 80px " id="check_desc_hint"></div>
+        <div style="margin-left: 80px " id="check_desc_hint"></div>
         <div class="orgRow mb10"><span class="ml10">组织URL：</span>
           <div class="w607 fr">http：//
-            <input type="text" name="organization[domain]" id="domain" value="<%= @organization.domain%>" class="orgUrlInput" />
+            <input type="text" name="organization[domain]" id="domain" value="<%= domain.nil? ? '' : domain.subname %>" class="orgUrlInput" />
             .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
-            <% if @organization.domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == @organization.domain %>
+            <% if domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == domain.subname %>
                 <span>(已批准)</span>
             <% elsif OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).count > 0 %>
                 <span>(您申请了子域名<%= OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content %>，还未批准)</span>
@@ -127,8 +128,8 @@
                 <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
                 <div class="mb5">
                   <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
-                  <% if @organization.domain %>
-                    <span class="fl"><%= @organization.domain %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">
+                  <% if domain %>
+                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">
                   <% else %>
                       <span class="fl">您还没有子域名，请先在左侧信息栏申请子域名</span>
                   <% end %>
diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb
index f3005c456..57b939af8 100644
--- a/app/views/users/user_organizations.html.erb
+++ b/app/views/users/user_organizations.html.erb
@@ -22,12 +22,7 @@
               </div>
               <div class="orgWrap">
                 <div class="orgTitle">
-                  <% if org.domain.nil? %>
                     <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %>
-                  <% else %>
-                    <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %>
-                    <!--<a href="http://test.<%#= org.domain %>.trustie.net" class = 'f16 linkBlue'><%#= org.name %></a>-->
-                  <% end %>
                 </div>
                 <div class="orgIntro"><%= org.description %></div>
                 <div class="postCreater">创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %></div>
diff --git a/db/migrate/20160223021012_add_index_to_secdomain.rb b/db/migrate/20160223021012_add_index_to_secdomain.rb
new file mode 100644
index 000000000..928dfdbab
--- /dev/null
+++ b/db/migrate/20160223021012_add_index_to_secdomain.rb
@@ -0,0 +1,5 @@
+class AddIndexToSecdomain < ActiveRecord::Migration
+  def change
+    add_index(:secdomains, :subname, unique: true)
+  end
+end
diff --git a/db/migrate/20160223021227_move_domain_to_secdomain.rb b/db/migrate/20160223021227_move_domain_to_secdomain.rb
new file mode 100644
index 000000000..0c78f0ac6
--- /dev/null
+++ b/db/migrate/20160223021227_move_domain_to_secdomain.rb
@@ -0,0 +1,14 @@
+class MoveDomainToSecdomain < ActiveRecord::Migration
+  def up
+    Secdomain.transaction do
+      #将组织中的子域名迁移至secdomains表
+      Organization.where("domain is not null").each do |org|
+        Secdomain.create(sub_type: 2,  subname: org.domain, pid: org.id)
+      end
+      #remove_column :organizations, :domain
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160223031843_remove_domain_from_organizations.rb b/db/migrate/20160223031843_remove_domain_from_organizations.rb
new file mode 100644
index 000000000..d49ab3964
--- /dev/null
+++ b/db/migrate/20160223031843_remove_domain_from_organizations.rb
@@ -0,0 +1,8 @@
+class RemoveDomainFromOrganizations < ActiveRecord::Migration
+  def up
+    remove_column :organizations, :domain
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4f39b4848..f82620dd2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160202034530) do
+ActiveRecord::Schema.define(:version => 20160223031843) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1265,7 +1265,6 @@ ActiveRecord::Schema.define(:version => 20160202034530) do
     t.text     "description"
     t.integer  "creator_id"
     t.integer  "home_id"
-    t.string   "domain"
     t.boolean  "is_public"
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
@@ -1543,6 +1542,8 @@ ActiveRecord::Schema.define(:version => 20160202034530) do
     t.datetime "updated_at",                :null => false
   end
 
+  add_index "secdomains", ["subname"], :name => "index_secdomains_on_subname", :unique => true
+
   create_table "seems_rateable_cached_ratings", :force => true do |t|
     t.integer  "cacheable_id",   :limit => 8
     t.string   "cacheable_type"
@@ -1726,6 +1727,10 @@ ActiveRecord::Schema.define(:version => 20160202034530) do
     t.string   "extra"
   end
 
+  create_table "temp", :id => false, :force => true do |t|
+    t.integer "id", :default => 0, :null => false
+  end
+
   create_table "time_entries", :force => true do |t|
     t.integer  "project_id",  :null => false
     t.integer  "user_id",     :null => false