Skip to content

Commit

Permalink
Merge pull request #43768 from nextcloud/artonge/tests/add_tests_for_…
Browse files Browse the repository at this point in the history
…versions_actions
  • Loading branch information
skjnldsv authored Feb 27, 2024
2 parents 250084f + f7a0246 commit 455a209
Show file tree
Hide file tree
Showing 23 changed files with 609 additions and 423 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,4 @@ core/js/mimetypelist.js
# Tests - cypress
cypress/snapshots
cypress/videos
cypress/downloads
10 changes: 5 additions & 5 deletions apps/dav/lib/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,6 @@ public function __construct(IRequest $request, string $baseUri) {
$this->server->addPlugin(new FakeLockerPlugin());
}

// Allow view-only plugin for webdav requests
$this->server->addPlugin(new ViewOnlyPlugin(
\OC::$server->getUserFolder(),
));

if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
$this->server->addPlugin(new BrowserErrorPagePlugin());
}
Expand All @@ -255,6 +250,11 @@ public function __construct(IRequest $request, string $baseUri) {

// wait with registering these until auth is handled and the filesystem is setup
$this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger) {
// Allow view-only plugin for webdav requests
$this->server->addPlugin(new ViewOnlyPlugin(
\OC::$server->getUserFolder(),
));

// custom properties plugin must be the last one
$userSession = \OC::$server->getUserSession();
$user = $userSession->getUser();
Expand Down
290 changes: 0 additions & 290 deletions apps/files_sharing/src/components/SharePermissionsEditor.vue

This file was deleted.

1 change: 1 addition & 0 deletions apps/files_sharing/src/components/SharingEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
@open-sharing-details="openShareDetailsForCustomSettings(share)" />
</div>
<NcButton class="sharing-entry__action"
data-cy-files-sharing-share-actions
:aria-label="t('files_sharing', 'Open Sharing Details')"
type="tertiary"
@click="openSharingDetails(share)">
Expand Down
Loading

0 comments on commit 455a209

Please sign in to comment.