From 885b6f6092432b43714722aebc2b9b92c5f3e775 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 6 May 2016 10:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8E=89=E2=80=9C=E7=BB=BC?=
 =?UTF-8?q?=E5=90=88=E2=80=9D=E9=80=89=E9=A1=B9=EF=BC=8C=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E6=98=BE=E7=A4=BA20=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/sub_document_comments_controller.rb | 4 ++--
 app/views/organizations/setting.html.erb            | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index 55a98e5b0..ed12ac8f7 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -51,11 +51,11 @@ class SubDocumentCommentsController < ApplicationController
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @documents = @subdomain.sub_document_comments.where("parent_id is null").order("created_at desc")
       @is_remote = true
-      @limit = 2
+      @limit = 20
       @atta_count = @documents.count
       @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
       @offset ||= @atta_pages.offset
-      @documents = paginateHelper @documents,2
+      @documents = paginateHelper @documents,20
       respond_to do |format|
         format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
       end
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 396741246..c989b259c 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -152,10 +152,10 @@
                 <input type="radio" id="orgMeb" value="Resource" name="field_type" />
                 <label for="orgMeb">资源</label>
               </li>
-              <li class="fl">
-                <input type="radio" id="orgMeb" value="Resource" name="field_type" />
-                <label for="orgMeb">综合</label>
-              </li>
+              <!--<li class="fl">-->
+                <!--<input type="radio" id="orgCom" value="Complex" name="field_type" />-->
+                <!--<label for="orgMeb">综合</label>-->
+              <!--</li>-->
               <li class="fr"><a href="javascript:void(0);" class="saveBtn db" onclick="add_org_subfield();">新增</a></li>
               <li class="cl"></li>
             </ul>