upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #60798 from nextcloud/backport/60741/stable34

Browse source 
[stable34] fix(encryption): recovery keys should be shown when user keys are used
This commit is contained in:
Andy Scherzinger 2026-06-01 23:23:09 +02:00 committed by GitHub
commit bae7b687fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/encryption/src/views/SettingsAdmin.vue
View file

@ -33,8 +33,8 @@ const recoveryEnabled = ref(adminSettings.recoveryEnabled!)
<template v-else>
<SettingsAdminHomeStorage v-model="encryptHomeStorage" />
<br>
<SettingsAdminRecoveryKey v-if="adminSettings.masterKeyEnabled" v-model="recoveryEnabled" />
<SettingsAdminRecoveryKeyChange v-if="adminSettings.masterKeyEnabled && recoveryEnabled" />
<SettingsAdminRecoveryKey v-if="!adminSettings.masterKeyEnabled" v-model="recoveryEnabled" />
<SettingsAdminRecoveryKeyChange v-if="!adminSettings.masterKeyEnabled && recoveryEnabled" />
</template>
</NcSettingsSection>
</template>

2
dist/encryption-settings_admin.mjs vendored
View file

File diff suppressed because one or more lines are too long

2
dist/encryption-settings_admin.mjs.map vendored
View file

File diff suppressed because one or more lines are too long