Merge pull request #25915 from nextcloud/bugfix/noid/option-always-show-unique-label
Add appconfig to always show the unique label of a sharee
This commit is contained in:
commit
c3361a2b13
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -116,7 +116,8 @@ class Capabilities implements ICapability {
|
|||
|
||||
// Sharee searches
|
||||
$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 [
|
||||
|
|
|
@ -405,7 +405,9 @@ export default {
|
|||
*/
|
||||
formatForMultiselect(result) {
|
||||
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.server) {
|
||||
desc = t('files_sharing', 'on {server}', { server: result.value.server })
|
||||
|
|
|
@ -229,6 +229,15 @@ export default class Config {
|
|||
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 ?
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue