组织栏目子目录

app/controllers/org_subfields_controller.rb

@@ -3,6 +3,13 @@ class OrgSubfieldsController < ApplicationController
     @subfield = OrgSubfield.create(:name => params[:name])
     @organization = Organization.find(params[:organization_id])
     @organization.org_subfields << @subfield
+    if !params[:sub_dir].blank?
+      sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
+            "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
+      if SubfieldSubdomainDir.find_by_sql(sql).count == 0
+        SubfieldSubdomainDir.create(:org_subfield_id => @org_subfield.id, :name => params[:sub_dir])
+      end
+    end
     @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
   end
 
@@ -11,9 +18,58 @@ class OrgSubfieldsController < ApplicationController
     @subfield = @organization.org_subfields.first
     if @subfield.field_type == 'Post'
       redirect_to organization_path(@organization, :org_subfield_id => @subfield.id)
-    else
+    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 "+
+        " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name=#{params[:name]}").first
+    if params[:sort]
+      params[:sort].split(",").each do |sort_type|
+        order_by = sort_type.split(":")
 
+        case order_by[0]
+          when "filename"
+            attribute = "filename"
+          when "size"
+            attribute = "filesize"
+          when "attach_type"
+            attribute = "attachtype"
+          when "content_type"
+            attribute = "created_on"
+          when "field_file_dense"
+            attribute = "is_public"
+          when "downloads"
+            attribute = "downloads"
+          when "created_on"
+            attribute = "created_on"
+          when "quotes"
+            attribute = "quotes"
+          else
+            attribute = "created_on"
+        end
+        @sort = order_by[0]
+        @order = order_by[1]
+        if order_by.count == 1 && attribute
+          sort += "#{Attachment.table_name}.#{attribute} asc "
+          if sort_type != params[:sort].split(",").last
+            sort += ","
+          end
+        elsif order_by.count == 2 && order_by[1]
+          sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+          if sort_type != params[:sort].split(",").last
+            sort += ","
+          end
+        end
+      end
+    else
+      sort = "#{Attachment.table_name}.created_on desc"
     end
+    @container_type = 2
+    @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+    @organization = Organization.find(@containers.first.organization_id)
+    show_attachments @containers
+    @tag_list = attachment_tag_list @all_attachments
+    @page = params[:page] || 1
+    render :layout => 'base_org'
     # @org_subfield = OrgSubfield.find(params[:id])
     # @organization = @org_subfield.organization.id
     # @messages = []

app/models/org_subfield.rb

@@ -1,5 +1,6 @@
 class OrgSubfield < ActiveRecord::Base
   belongs_to :organization, :foreign_key => :organization_id
+  has_one :subfield_subdomain_dir
   has_many :org_document_comments, :dependent => :destroy
   has_many :files
   has_many :org_subfield_messages, :dependent => :destroy

app/models/subfield_subdomain_dir.rb

@@ -0,0 +1,4 @@
+class SubfieldSubdomainDir < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :org_subfield
+end

app/views/organizations/setting.html.erb

@@ -114,26 +114,30 @@
           <div class="fr">
             <p class="fontBlue fb mb5">新增栏目</p>
             <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
-            <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
-            <div class="mb5">
-              <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
-              <span class="fl">micros.trustie.net/</span><input class="fl personalUrl ml3" type="text">
-              <div class="cl"></div>
-            </div>
-            <ul class="orgAddRole">
-              <li class="fontGrey3 fb mb10">栏目类型</li>
-              <li class="fl mr15">
-                <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
-                <label for="orgMng">帖子</label>
-              </li>
-              <li class="fl">
-                <input type="radio" id="orgMeb" value="Resource" name="field_type" />
-                <label for="orgMeb">资源</label>
-              </li>
-              <li class="cl"></li>
-            </ul>
-            <div class="cl"></div>
-            <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield();">确定</a>
+                <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">
+                  <% else %>
+                      <span class="fl">您还没有子域名，请先在左侧信息栏申请子域名</span>
+                  <% end %>
+                  <div class="cl"></div>
+                </div>
+                <ul class="orgAddRole">
+                  <li class="fontGrey3 fb mb10">栏目类型</li>
+                  <li class="fl mr15">
+                    <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
+                    <label for="orgMng">帖子</label>
+                  </li>
+                  <li class="fl">
+                    <input type="radio" id="orgMeb" value="Resource" name="field_type" />
+                    <label for="orgMeb">资源</label>
+                  </li>
+                  <li class="cl"></li>
+                </ul>
+                <div class="cl"></div>
+                <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield();">确定</a>
             <% end %>
           </div>
         </div>

db/migrate/20160108093752_add_status_to_org_messages.rb

@@ -0,0 +1,5 @@
+class AddStatusToOrgMessages < ActiveRecord::Migration
+  def change
+    add_column :org_messages, :status, :integer, :default => 0
+  end
+end

db/migrate/20160112085834_create_subfield_subdomain_dirs.rb

@@ -0,0 +1,9 @@
+class CreateSubfieldSubdomainDirs < ActiveRecord::Migration
+  def change
+    create_table :subfield_subdomain_dirs do |t|
+      t.integer :org_subfield_id
+      t.string :name
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160108093752) do
+ActiveRecord::Schema.define(:version => 20160112085834) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1656,6 +1656,13 @@ ActiveRecord::Schema.define(:version => 20160108093752) do
   add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
   add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
 
+  create_table "subfield_subdomain_dirs", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.string   "name"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"

spec/factories/subfield_subdomain_dirs.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :subfield_subdomain_dir do
+    
+  end
+
+end

spec/models/subfield_subdomain_dir_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubfieldSubdomainDir, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end