diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 8cf2726cdc..2a41f7d2ab 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -114,7 +114,7 @@ tbody tr td:first-child input {display: none;} } else { - echo '' . $story->title . ''; + echo $story->title; } ?> diff --git a/module/doc/control.php b/module/doc/control.php index 8f20746715..5f717e81ca 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -860,6 +860,7 @@ class doc extends control if($doclib->acl == 'open') return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control picker-select' multiple $dropDirection")); if($doclib->acl == 'default') return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control picker-select' multiple $dropDirection")); if($doclib->acl == 'private') echo 'private'; + return false; } @@ -876,7 +877,15 @@ class doc extends control } if($doclib->acl == 'open') return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control picker-select' $dropDirection")); if($doclib->acl == 'default') return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control picker-select' $dropDirection")); - if($doclib->acl == 'private') echo 'private'; + if($doclib->acl == 'private' and $doclib->type == 'project') + { + echo 'project'; + } + else + { + echo 'private'; + } + return false; } @@ -891,7 +900,7 @@ class doc extends control $selectedUser = $whitelist; } - return print(html::select('users[]', $users, $selectedUser, "class='form-control chosen' multiple")); + return print(html::select('users[]', $users, $selectedUser, "class='form-control picker-select' multiple")); } /** diff --git a/module/doc/js/common.js b/module/doc/js/common.js index 328fed5690..ead6832715 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -41,6 +41,7 @@ function toggleAcl(acl, type) else { $('#whiteListBox').addClass('hidden'); + if(type == 'doc') loadWhitelist(libID); } if(type == 'lib') @@ -57,8 +58,8 @@ function toggleAcl(acl, type) $.get(link, function(users) { $('#users').replaceWith(users); - $('#users_chosen').remove(); - $('#users').chosen(); + $('#user').next(' .picker').remove(); + $('#users').picker(); }) } } diff --git a/module/doc/js/create.js b/module/doc/js/create.js index 65cbb2073d..151c3619ea 100644 --- a/module/doc/js/create.js +++ b/module/doc/js/create.js @@ -117,9 +117,9 @@ function loadWhitelist(libID) { if(groups != 'private') { - $('#groups').replaceWith(groups); - $('#groups_chosen').remove(); - $('#groups').picker(); + $('#groups').replaceWith(groups); + $('#groups').next('.picker').remove(); + $('#groups').picker(); } }); @@ -132,14 +132,20 @@ function loadWhitelist(libID) $('#whiteListBox').addClass('hidden'); $('#aclprivate').prop('checked', true); } + else if(users == 'project') + { + $('#aclprivate').parent('.radio-inline').addClass('hidden'); + $('#aclcustom').parent('.radio-inline').addClass('hidden'); + $('#whiteListBox').addClass('hidden'); + $('#aclopen').prop('checked', true); + } else { $('#aclopen').parent('.radio-inline').removeClass('hidden'); $('#aclcustom').parent('.radio-inline').removeClass('hidden'); $('#users').replaceWith(users); - $('#users_chosen').remove(); - $('#whiteListBox .picker').remove(); + $('#users').next('.picker').remove(); $('#users').picker(); } }); diff --git a/module/doc/js/edit.js b/module/doc/js/edit.js index 64e78ccdbe..f5ead4f0c2 100644 --- a/module/doc/js/edit.js +++ b/module/doc/js/edit.js @@ -141,9 +141,9 @@ function loadWhitelist(libID) { if(groups != 'private') { - $('#groups').replaceWith(groups); - $('#groups_chosen').remove(); - $('#groups').picker(); + $('#groups').replaceWith(groups); + $('#groups').next('.picker').remove(); + $('#groups').picker(); } }); @@ -162,8 +162,7 @@ function loadWhitelist(libID) $('#aclcustom').parent('.radio-inline').removeClass('hidden'); $('#users').replaceWith(users); - $('#users_chosen').remove(); - $('#whiteListBox .picker').remove(); + $('#user').next('.picker').remove(); $('#users').picker(); } }); diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 1be6508f32..3e7ca03c0e 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -10,7 +10,6 @@ * @link http://www.zentao.net */ ?> -config->maxCount);?> doc->officeTypes, $docType) !== false):?>