diff options
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/css/detailsView.scss | 6 | ||||
| -rw-r--r-- | apps/files/css/files.scss | 10 | ||||
| -rw-r--r-- | apps/files/js/app.js | 1 | ||||
| -rw-r--r-- | apps/files/js/favoritesplugin.js | 1 | ||||
| -rw-r--r-- | apps/files/js/recentplugin.js | 1 | ||||
| -rw-r--r-- | apps/files/lib/Command/TransferOwnership.php | 3 | ||||
| -rw-r--r-- | apps/files/tests/Controller/ViewControllerTest.php | 63 |
7 files changed, 70 insertions, 15 deletions
diff --git a/apps/files/css/detailsView.scss b/apps/files/css/detailsView.scss index e0c1bbfa095..f64a3702850 100644 --- a/apps/files/css/detailsView.scss +++ b/apps/files/css/detailsView.scss @@ -7,12 +7,6 @@ clear: both; } -#app-sidebar .mainFileInfoView { - margin-right: 20px; /* accommodate for close icon */ - float:left; - display:block; - width: 100%; -} #app-sidebar .mainFileInfoView .icon { display: inline-block; diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 2a71af038cf..47120ede7a0 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -63,12 +63,11 @@ .app-files #app-content { transition: background-color 0.3s ease; - overflow-x: hidden; } .file-drag, .file-drag #filestable tbody tr, .file-drag #filestable tbody tr:hover { transition: background-color 0.3s ease!important; - background-color: rgb(179, 230, 255)!important; + background-color: rgb(179, 230, 255) !important; } .app-files #app-content.dir-drop { @@ -91,10 +90,11 @@ @include icon-color('recent', 'files', $color-black); } .nav-icon-favorites { - @include icon-color('star-dark', 'files', $color-black, 2, true); + @include icon-color('star-dark', 'actions', $color-black, 2, true); } .nav-icon-sharingin, -.nav-icon-sharingout { +.nav-icon-sharingout, +.nav-icon-shareoverview { @include icon-color('share', 'files', $color-black); } .nav-icon-sharinglinks { @@ -256,7 +256,7 @@ table.multiselect thead { z-index: 55; -moz-box-sizing: border-box; box-sizing: border-box; - left: 250px; /* sidebar */ + left: $navigation-width; } table.multiselect thead th { diff --git a/apps/files/js/app.js b/apps/files/js/app.js index c2cef563fa0..3630ed7587d 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -83,7 +83,6 @@ // TODO: ideally these should be in a separate class / app (the embedded "all files" app) this.fileList = new OCA.Files.FileList( $('#app-content-files'), { - scrollContainer: $('#app-content'), dragOptions: dragOptions, folderDropOptions: folderDropOptions, fileActions: fileActions, diff --git a/apps/files/js/favoritesplugin.js b/apps/files/js/favoritesplugin.js index 454a505c7bd..7294ef9461c 100644 --- a/apps/files/js/favoritesplugin.js +++ b/apps/files/js/favoritesplugin.js @@ -67,7 +67,6 @@ return new OCA.Files.FavoritesFileList( $el, { fileActions: fileActions, - scrollContainer: $('#app-content') } ); }, diff --git a/apps/files/js/recentplugin.js b/apps/files/js/recentplugin.js index fcd427b18a2..524b556a517 100644 --- a/apps/files/js/recentplugin.js +++ b/apps/files/js/recentplugin.js @@ -67,7 +67,6 @@ return new OCA.Files.RecentFileList( $el, { fileActions: fileActions, - scrollContainer: $('#app-content') } ); }, diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php index d175f66d171..6113f6df54c 100644 --- a/apps/files/lib/Command/TransferOwnership.php +++ b/apps/files/lib/Command/TransferOwnership.php @@ -263,7 +263,8 @@ class TransferOwnership extends Command { foreach($this->shares as $share) { try { - if ($share->getSharedWith() === $this->destinationUser) { + if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER && + $share->getSharedWith() === $this->destinationUser) { // Unmount the shares before deleting, so we don't try to get the storage later on. $shareMountPoint = $this->mountManager->find('/' . $this->destinationUser . '/files' . $share->getTarget()); if ($shareMountPoint) { diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 674d4a9542e..7dc99409800 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -203,6 +203,49 @@ class ViewControllerTest extends TestCase { 'type' => 'link', 'classes' => 'pinned', ], + 'shareoverview' => [ + 'id' => 'shareoverview', + 'appname' => 'files_sharing', + 'script' => 'list.php', + 'order' => 18, + 'name' => \OC::$server->getL10N('files_sharing')->t('Shares'), + 'classes' => 'collapsible', + 'sublist' => [ + [ + 'id' => 'sharingout', + 'appname' => 'files_sharing', + 'script' => 'list.php', + 'order' => 16, + 'name' => \OC::$server->getL10N('files_sharing')->t('Shared with others'), + ], + [ + 'id' => 'sharingin', + 'appname' => 'files_sharing', + 'script' => 'list.php', + 'order' => 15, + 'name' => \OC::$server->getL10N('files_sharing')->t('Shared with you'), + ], + [ + 'id' => 'sharinglinks', + 'appname' => 'files_sharing', + 'script' => 'list.php', + 'order' => 17, + 'name' => \OC::$server->getL10N('files_sharing')->t('Shared by link', []), + ], + [ + 'id' => 'deletedshares', + 'appname' => 'files_sharing', + 'script' => 'list.php', + 'order' => 19, + 'name' => \OC::$server->getL10N('files_sharing')->t('Deleted shares'), + ], + ], + 'active' => false, + 'icon' => '', + 'type' => 'link', + 'expandedState' => 'show_sharing_menu', + 'defaultExpandedState' => false, + ] ]); $expected = new Http\TemplateResponse( @@ -240,6 +283,26 @@ class ViewControllerTest extends TestCase { 'id' => 'trashbin', 'content' => null, ], + 'sharingout' => [ + 'id' => 'sharingout', + 'content' => null, + ], + 'sharingin' => [ + 'id' => 'sharingin', + 'content' => null, + ], + 'sharinglinks' => [ + 'id' => 'sharinglinks', + 'content' => null, + ], + 'deletedshares' => [ + 'id' => 'deletedshares', + 'content' => null, + ], + 'shareoverview' => [ + 'id' => 'shareoverview', + 'content' => null, + ], ], 'hiddenFields' => [], ] |