mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26062 from nextcloud/backport/25915/stable21 

[stable21] Add appconfig to always show the unique label of a sharee
This commit is contained in:
Morris Jobke 2021-03-17 20:13:07 +01:00 committed by GitHub
parent c1c377f609 cd5e27e3f3
commit 0e642a5f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

3
apps/files_sharing/lib/Capabilities.php
View File

@ -116,7 +116,8 @@ class Capabilities implements ICapability {
// Sharee searches // Sharee searches
$res['sharee'] = [ $res['sharee'] = [
'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false) 'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false),
'always_show_unique' => $this->config->getAppValue('files_sharing', 'always_show_unique', 'yes') === 'yes',
]; ];
return [ return [

4
apps/files_sharing/src/components/SharingInput.vue
View File

@ -405,7 +405,9 @@ export default {
*/ */
formatForMultiselect(result) { formatForMultiselect(result) {
let desc let desc
if ((result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_REMOTE if (result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER && this.config.shouldAlwaysShowUnique) {
desc = result.shareWithDisplayNameUnique ?? ''
} else if ((result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_REMOTE
|| result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP || result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP
) && result.value.server) { ) && result.value.server) {
desc = t('files_sharing', 'on {server}', { server: result.value.server }) desc = t('files_sharing', 'on {server}', { server: result.value.server })

9
apps/files_sharing/src/services/ConfigService.js
View File

@ -229,6 +229,15 @@ export default class Config {
return (OC.getCapabilities().files_sharing.sharebymail === undefined) ? false : OC.getCapabilities().files_sharing.sharebymail.password.enforced return (OC.getCapabilities().files_sharing.sharebymail === undefined) ? false : OC.getCapabilities().files_sharing.sharebymail.password.enforced
} }
/**
* @returns {boolean}
* @readonly
* @memberof Config
*/
get shouldAlwaysShowUnique() {
return (OC.getCapabilities().files_sharing?.sharee?.always_show_unique === true)
}
/** /**
* Is sharing with groups allowed ? * Is sharing with groups allowed ?
* *