Skip to content

Commit d4d44c8

Browse files
authored
Merge pull request #18675 from nextcloud/fix/17774/no_email_suggestions_when_linkshare_disabled
Do not show e-mail suggestions if link shares are disabled
2 parents a7b3ed3 + 9a8b361 commit d4d44c8

File tree

4 files changed

+83
-67
lines changed

4 files changed

+83
-67
lines changed

apps/files_sharing/js/dist/files_sharing_tab.js

Lines changed: 65 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/js/dist/files_sharing_tab.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/src/components/SharingInput.vue

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export default {
132132
return t('files_sharing', 'Name, federated cloud ID or email address …')
133133
}
134134
135-
return t('files_sharing', 'Name …')
135+
return t('files_sharing', 'Name …')
136136
},
137137
138138
isValidQuery() {
@@ -184,13 +184,28 @@ export default {
184184
lookup = true
185185
}
186186
187+
const shareType = [
188+
this.SHARE_TYPES.SHARE_TYPE_USER,
189+
this.SHARE_TYPES.SHARE_TYPE_GROUP,
190+
this.SHARE_TYPES.SHARE_TYPE_REMOTE,
191+
this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP,
192+
this.SHARE_TYPES.SHARE_TYPE_CIRCLE,
193+
this.SHARE_TYPES.SHARE_TYPE_ROOM,
194+
this.SHARE_TYPES.SHARE_TYPE_GUEST,
195+
]
196+
197+
if (OC.getCapabilities()['files_sharing']['public']['enabled'] === true) {
198+
shareType.push(this.SHARE_TYPES.SHARE_TYPE_EMAIL)
199+
}
200+
187201
const request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', {
188202
params: {
189203
format: 'json',
190204
itemType: this.fileInfo.type === 'dir' ? 'folder' : 'file',
191205
search,
192206
lookup,
193207
perPage: this.config.maxAutocompleteResults,
208+
shareType,
194209
},
195210
})
196211

apps/files_sharing/src/services/ConfigService.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ export default class Config {
179179
*/
180180
get isMailShareAllowed() {
181181
return OC.appConfig.shareByMailEnabled !== undefined
182+
&& OC.getCapabilities()['files_sharing']['public']['enabled'] === true
182183
}
183184

184185
/**

0 commit comments

Comments
 (0)