* Finish task #89141.

module/doc/css/common.css

@@ -104,3 +104,5 @@ ol, ul {margin-bottom: 0}
 
 #subHeader .list-group>a.selected {color: #e9f2fb !important;}
 #pageNav #dropMenu .table-col .list-group .icon-move {display:block; float: left; font-size: 12px; padding: 3px 4px 3px 1px;}
+
+#aclBox .acl-tip {color: #838a9d;}

module/doc/css/createlib.css

@@ -3,7 +3,6 @@ form {margin-bottom: 50px;}
 table {width: 90% !important;}
 #mainContent table th {width: 70px;}
 
-#aclBox .acl-tip {color: #838a9d;}
 #whiteListBox div.input-group {margin-bottom: 2px;}
 
 #product_chosen {width: 50% !important;}

module/doc/lang/zh-cn.php

@@ -149,7 +149,7 @@ $lang->doc->api              = '接口';
 
 $lang->doc->collectAction = '收藏文档';
 
-$lang->doc->libName           = '文档库名称';
+$lang->doc->libName           = '库名称';
 $lang->doc->libType           = '库类型';
 $lang->doc->custom            = '自定义文档库';
 $lang->doc->customAB          = '自定义库';

module/doc/model.php

@@ -296,21 +296,15 @@ class docModel extends model
             ->setDefault('groups', '')
             ->join('groups', ',')
             ->join('users', ',')
+            ->remove('uid,contactListMenu')
             ->get();
 
-        if($oldLib->type == 'project' or $oldLib->type == 'custom')
+        if($oldLib->type == 'project')
         {
             $libCreatedBy = $this->dao->select('*')->from(TABLE_ACTION)->where('objectType')->eq('doclib')->andWhere('objectID')->eq($libID)->andWhere('action')->eq('created')->fetch('actor');
 
-            if($oldLib->type == 'custom')
-            {
-                if($lib->acl == 'private') $lib->users = $libCreatedBy ? $libCreatedBy : $this->app->user->account;
-            }
-            else
-            {
-                $openedBy = $this->dao->findById($oldLib->project)->from(TABLE_PROJECT)->fetch('openedBy');
-                if($lib->acl == 'private' and $lib->acl == 'custom') $lib->users .= ',' . $libCreatedBy ? $libCreatedBy : $openedBy;
-            }
+            $openedBy = $this->dao->findById($oldLib->project)->from(TABLE_PROJECT)->fetch('openedBy');
+            if($lib->acl == 'private' and $lib->acl == 'custom') $lib->users .= ',' . $libCreatedBy ? $libCreatedBy : $openedBy;
         }
         if($oldLib->acl != $lib->acl and $lib->acl == 'open') $lib->users = '';
 

module/doc/view/editlib.html.php

@@ -47,7 +47,7 @@
           <span class='hidden'><?php echo html::radio('type', $lang->doc->libTypeList, $lib->type);?></span>
         </td>
       </tr>
-      <tr>
+      <tr id="aclBox">
         <th><?php echo $lang->doclib->control;?></th>
         <td>
           <?php echo html::radio('acl', $lang->doclib->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?>
@@ -63,6 +63,7 @@
           <div class='input-group'>
             <span class='input-group-addon'><?php echo $lang->doclib->user?></span>
             <?php echo html::select('users[]', $users, $lib->users, "class='form-control picker-select' multiple")?>
+            <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=users&attr=data-drop_direction='up'");?>
           </div>
         </td>
       </tr>