Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions apps/settings/src/constants/AppsConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { translate as t } from '@nextcloud/l10n'

/** Enum of verification constants, according to Apps */
export const APPS_SECTION_ENUM = Object.freeze({
installed: t('settings', 'Your apps'),
enabled: t('settings', 'Active apps'),
disabled: t('settings', 'Disabled apps'),
updates: t('settings', 'Updates'),
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/mixins/AppManagement.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default {
if (this.app.needsDownload) {
return t('settings', 'The app will be downloaded from the App Store')
}
return false
return null
},
forceEnableButtonTooltip() {
const base = t('settings', 'This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected.')
Expand Down
13 changes: 11 additions & 2 deletions apps/settings/src/views/Apps.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
:to="{ name: 'apps' }"
:exact="true"
icon="icon-category-installed"
:name="t('settings', 'Your apps')" />
:name="$options.APPS_SECTION_ENUM.installed" />
<NcAppNavigationItem id="app-category-enabled"
:to="{ name: 'apps-category', params: { category: 'enabled' } }"
icon="icon-category-enabled"
Expand Down Expand Up @@ -88,7 +88,9 @@
</NcAppNavigation>

<!-- Apps list -->
<NcAppContent class="app-settings-content" :class="{ 'icon-loading': loadingList }">
<NcAppContent class="app-settings-content"
:class="{ 'icon-loading': loadingList }"
:page-heading="pageHeading">
<AppList :category="category" :app="app" :search="searchQuery" />
</NcAppContent>

Expand Down Expand Up @@ -206,6 +208,13 @@ export default {
},

computed: {
pageHeading() {
if (this.$options.APPS_SECTION_ENUM[this.category]) {
return this.$options.APPS_SECTION_ENUM[this.category]
}
const category = this.$store.getters.getCategoryById(this.category)
return category.displayName
},
loading() {
return this.$store.getters.loading('categories')
},
Expand Down
13 changes: 12 additions & 1 deletion apps/settings/src/views/Users.vue
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
4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-apps-view-7418.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-apps-view-7418.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-users-8351.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-8351.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.