Commit a2f22264 authored by Agate's avatar Agate 💬

Merge branch '245-admin-menu' into 'develop'

Resolve "Disappearing admin menu in the sidebar"

Closes #245

See merge request funkwhale/funkwhale!245
parents 946401fd 9f18b950
Fixed admin menu not showing after login (#245)
...@@ -272,7 +272,7 @@ export default { ...@@ -272,7 +272,7 @@ export default {
this.scrollToCurrent() this.scrollToCurrent()
} }
}, },
'$store.state.availablePermissions': { '$store.state.auth.availablePermissions': {
handler () { handler () {
this.fetchNotificationsCount() this.fetchNotificationsCount()
}, },
......
...@@ -79,8 +79,6 @@ export default { ...@@ -79,8 +79,6 @@ export default {
username: this.credentials.username, username: this.credentials.username,
password: this.credentials.password password: this.credentials.password
} }
// We need to pass the component's this context
// to properly make use of http in the auth service
this.$store.dispatch('auth/login', { this.$store.dispatch('auth/login', {
credentials, credentials,
next: '/library', next: '/library',
......
...@@ -25,7 +25,11 @@ export default { ...@@ -25,7 +25,11 @@ export default {
state.username = '' state.username = ''
state.token = '' state.token = ''
state.tokenData = {} state.tokenData = {}
state.availablePermissions = {} state.availablePermissions = {
federation: false,
library: false,
upload: false
}
}, },
profile: (state, value) => { profile: (state, value) => {
state.profile = value state.profile = value
...@@ -108,8 +112,8 @@ export default { ...@@ -108,8 +112,8 @@ export default {
commit('authenticated', true) commit('authenticated', true)
commit('profile', data) commit('profile', data)
commit('username', data.username) commit('username', data.username)
dispatch('favorites/fetch', null, {root: true}) dispatch('favorites/fetch', null, { root: true })
dispatch('playlists/fetchOwn', null, {root: true}) dispatch('playlists/fetchOwn', null, { root: true })
Object.keys(data.permissions).forEach(function (key) { Object.keys(data.permissions).forEach(function (key) {
// this makes it easier to check for permissions in templates // this makes it easier to check for permissions in templates
commit('permission', {key, status: data.permissions[String(key)]}) commit('permission', {key, status: data.permissions[String(key)]})
......
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