wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1985 from owncloud/sharing-more

Browse source 
up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135
This commit is contained in:
Bernhard Posselt 2013-02-28 03:44:51 -08:00
commit 4223e99629
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/ajax/share.php
View file

@ -185,8 +185,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$users = array();
$limit = 0;
$offset = 0;
while ($count < 4 && count($users) == $limit) {
$limit = 4 - $count;
while ($count < 15 && count($users) == $limit) {
$limit = 15 - $count;
if ($sharePolicy == 'groups_only') {
$users = OC_Group::DisplayNamesInGroups($groups, $_GET['search'], $limit, $offset);
} else {
@ -209,7 +209,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
$count = 0;
foreach ($groups as $group) {
if ($count < 4) {
if ($count < 15) {
if (stripos($group, $_GET['search']) !== false
&& (!isset($_GET['itemShares'])
|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])

6
core/css/share.css
View file

@ -91,3 +91,9 @@
}
.reshare { white-space:normal; } /* fix shared by text going out of box */
.ui-autocomplete { /* limit dropdown height to 4 1/2 entries */
max-height:103px;
overflow-y:auto;
overflow-x:hidden;
}