Skip to content

[stable28] enh(settings): Set main page heading #42125

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
susnux merged 4 commits into from
Dec 14, 2023
Merged

[stable28] enh(settings): Set main page heading #42125

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd20198
enh(settings): Set main heading for User management
Pytal Dec 8, 2023
291e56d
enh(settings): Set main heading for Apps
Pytal Dec 8, 2023
8d82cff
fix(settings): Expected string aria-label got boolean error
Pytal Dec 8, 2023
433ef6b
chore(assets): Recompile assets
nextcloud-command Dec 8, 2023
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
Next Next commit
enh(settings): Set main heading for User management 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal @backportbot-nextcloud
Pytal authored and backportbot-nextcloud[bot] committed Dec 8, 2023
commit fd201984641a1d07d6b2f9fec6f22aefc39f2148
13 changes: 12 additions & 1 deletion apps/settings/src/views/Users.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
</template>
</NcAppNavigation>

<NcAppContent>
<NcAppContent :page-heading="pageHeading">
<UserList :selected-group="selectedGroupDecoded"
:external-actions="externalActions" />
</NcAppContent>
Expand Down Expand Up @@ -212,6 +212,17 @@ export default {
},
computed: {
pageHeading() {
if (this.selectedGroupDecoded === null) {
return t('settings', 'Active users')
}
const matchHeading = {
admin: t('settings', 'Admins'),
disabled: t('settings', 'Disabled users'),
}
return matchHeading[this.selectedGroupDecoded] ?? t('settings', 'User group: {group}', { group: this.selectedGroupDecoded })
},
showConfig() {
return this.$store.getters.getShowConfig
},
Expand Down