Skip to content

[stable20] Fix sharing tab state not matching resharing admin settings #24044

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

Merged
MorrisJobke merged 5 commits into from
Nov 11, 2020
Merged

[stable20] Fix sharing tab state not matching resharing admin settings #24044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c034dff
Do not show "Can reshare" in the menu if resharing is not allowed
danxuliu Nov 10, 2020
bafab8a
Disable share input for a received share if resharing is not allowed
danxuliu Nov 10, 2020
7d7169f
Add acceptance tests for reshares when resharing is disabled
danxuliu Nov 10, 2020
f58174f
Add acceptance tests for reshares by link when resharing is disabled
danxuliu Nov 10, 2020
487c603
Add integration tests for default share permissions
danxuliu Nov 10, 2020
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
Prev Previous commit
Next Next commit
Disable share input for a received share if resharing is not allowed 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Nov 11, 2020
commit bafab8af2d3a9da76d9f7df7d02b3a22b4803e34
2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing_tab.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing_tab.js.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion apps/files_sharing/src/views/SharingTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ import Avatar from '@nextcloud/vue/dist/Components/Avatar'
import axios from '@nextcloud/axios'
import Tab from '@nextcloud/vue/dist/Components/AppSidebarTab'

import Config from '../services/ConfigService'
import { shareWithTitle } from '../utils/SharedWithMe'
import Share from '../models/Share'
import ShareTypes from '../mixins/ShareTypes'
Expand Down Expand Up @@ -132,6 +133,8 @@ export default {

data() {
return {
config: new Config(),

error: '',
expirationInterval: null,
icon: 'icon-share',
Expand Down Expand Up @@ -178,7 +181,7 @@ export default {

canReshare() {
return !!(this.fileInfo.permissions & OC.PERMISSION_SHARE)
|| !!(this.reshare && this.reshare.hasSharePermission)
|| !!(this.reshare && this.reshare.hasSharePermission && this.config.isResharingAllowed)
},
},

Expand Down