Commit 54766148 authored by anton's avatar anton
Browse files

FIx assets navigation items

parent cd301f4a
Pipeline #79335 passed with stage
in 1 minute and 14 seconds
......@@ -308,7 +308,7 @@
name: 'users.groups_create'
}
}
if (this.breadcrumbs[0].label === 'Assets' && !this.breadcrumbs[1]) {
if (this.breadcrumbs[0].label === 'Assets' && this.$route.name !== 'users.assets_upload' && !this.breadcrumbs[1]) {
ab = {
label: this.$t('navigation.users.assets_upload'),
route: 'assets/upload',
......
......@@ -206,7 +206,7 @@
q-item-main
q-item-tile
user-nav-button.text-white(
:route="{ name: 'users.assets', params: { uuid: 'me' } }",
:route="{ name: 'users.assets' }",
:label="$t('navigation.users.assets')",
name="users.assets",
icon="insert_drive_file")
......@@ -221,7 +221,7 @@
:disabled="currentRoute === 'users.assets_upload'",
:class="[currentRoute === 'users.assets_upload' ? 'bg-grey-9' : 'bg-primary']")
q-item-side(v-if="currentRoute === 'users.assets_upload'")
q-btn.bg-primary.text-white(type="a", to="/users/groups", icon="clear", round, size="sm")
q-btn.bg-primary.text-white(type="a", :to="{ name: 'users.assets' }", icon="clear", round, size="sm")
// ------------------------------------------------------------------------------------------------------ groups
q-item.q-pa-none.ui-border-bottom(v-if="user && showGroups", multiline)
......@@ -405,6 +405,7 @@
let routeSplit = typeof route.name === 'string' ? route.name.split('.') : undefined
if (routeSplit && routeSplit[0] !== 'site') this.currentApp = routeSplit[0]
if (routeSplit && route.name.indexOf('users.assets') === 0) this.currentApp = 'assets'
else this.currentApp = 'Motionbank'
if (routeSplit && routeSplit[1].substr(0, 6) === 'groups') this.currentApp = 'groups'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment