Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove not needed share filtering code #7645

Merged
merged 2 commits into from
Sep 16, 2022
Merged

Remove not needed share filtering code #7645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55d7f37
Remove not needed code
Sep 16, 2022
6c797af
skip the failing test in oc10
SwikritiT Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,6 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
)
}

/*
* FIXME: After the issue https://github.com/owncloud/ocis/issues/3592 has been solved,
* it shouldn't be necessary to filter the shares by shareOwner.
* therefore the code down below can be removed.
*/
const user = store.state.user
resources = resources.filter((r) => r.shareOwner === user.id)

store.commit('Files/LOAD_FILES', { currentFolder: null, files: resources })
})
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/features/webUISharingPublicExpire/shareByPublicLinkExpiringLinks.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Feature: Share by public link
| name | Public link |
| expiration | +6 |

@issue-ocis-1328 @skipOnOCIS
@issue-ocis-1328 @skipOnOCIS @skipOnOC10 # skipped on oc10 due to https://github.com/owncloud/web/issues/7513
Scenario: user cannot change the expiry date on existing public link to a date past the enforced max expiry date once max expiry date is changed
Given the setting "shareapi_default_expire_date" of app "core" has been set to "yes" in the server
And the setting "shareapi_expire_after_n_days" of app "core" has been set to "16" in the server
Expand Down