diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-28 03:44:51 -0800 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-28 03:44:51 -0800 |
| commit | 4223e99629b2e46bab05195b8788e78b4c25f588 (patch) | |
| tree | 56c64f8ea3bb5a4e53c45abbc41680cf23edb339 | |
| parent | a2147c4f890e400fd37f20aa45472e3a5a5954c8 (diff) | |
| parent | fbb989f548828673813fd1f11b6df639e31a48ac (diff) | |
| download | nextcloud-server-4223e99629b2e46bab05195b8788e78b4c25f588.tar.gz nextcloud-server-4223e99629b2e46bab05195b8788e78b4c25f588.zip | |
Merge pull request #1985 from owncloud/sharing-more
up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135
| -rw-r--r-- | core/ajax/share.php | 6 | ||||
| -rw-r--r-- | core/css/share.css | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index 332b6a0bed8..9201b48cb95 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -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]) diff --git a/core/css/share.css b/core/css/share.css index 2480a571ae5..2d6849b4bb1 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -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; +} |