Skip to content
Snippets Groups Projects
Commit 7b4c92dd authored by Thilo Wischmeyer's avatar Thilo Wischmeyer Committed by Thilo Wischmeyer
Browse files

Fixed password change dialog not opening

parent 19a2c22f
No related branches found
No related tags found
1 merge request!247Resolve "Update Vuetify"
......@@ -90,27 +90,7 @@
<v-spacer />
<instance-actions />
<v-divider vertical />
<v-toolbar-items class="user-menu">
<v-menu
bottom
offset-y
left
>
<template #activator="{ on }">
<v-btn
id="user-options"
text
v-on="on"
>
<v-icon left>
account_circle
</v-icon>
{{ username }} ({{ userRole }})<v-icon>arrow_drop_down</v-icon>
</v-btn>
</template>
<user-options />
</v-menu>
</v-toolbar-items>
<user-options />
</v-app-bar>
</div>
</template>
......@@ -127,8 +107,6 @@ export default {
name: 'BaseLayout',
components: { InstanceActions, UserOptions },
computed: {
username () { return Authentication.state.user.username },
userRole () { return Authentication.state.user.role },
gradySpeak () { return Authentication.gradySpeak },
isStudent () { return Authentication.isStudent },
...mapStateToComputedGetterSetter({
......
......@@ -21,7 +21,7 @@
autofocus
required
:error-messages="oldPasswordRejected ? 'Wrong password.' : undefined"
:rules="[ rules.required, rules.oldPasswordCorrect ]"
:rules="[ rules.required ]"
@input="oldPasswordRejected = false"
/>
<v-text-field
......
<template>
<div>
<v-list>
<v-list-item
v-if="!isStudent"
@click="showPasswordChangeDialog"
>
Change password
</v-list-item>
<v-divider class="my-2" />
<v-list-item @click="logout">
<v-icon left>
exit_to_app
</v-icon>
Logout
</v-list-item>
</v-list>
<v-toolbar-items>
<v-menu
bottom
offset-y
left
>
<template #activator="{ on }">
<v-btn
id="user-options"
text
v-on="on"
>
<v-icon left>
account_circle
</v-icon>
{{ username }} ({{ userRole }})<v-icon>arrow_drop_down</v-icon>
</v-btn>
</template>
<v-list>
<v-list-item
v-if="!isStudent"
@click="showPasswordChangeDialog"
>
Change password
</v-list-item>
<v-divider class="my-2" />
<v-list-item @click="logout">
<v-icon left>
exit_to_app
</v-icon>
Logout
</v-list-item>
</v-list>
</v-menu>
<component
:is="displayComponent"
v-if="displayComponent"
@hide="hideComponent"
/>
</div>
</v-toolbar-items>
</template>
<script>
......@@ -36,7 +54,9 @@ export default {
}
},
computed: {
isStudent: () => Authentication.isStudent,
isStudent() { return Authentication.isStudent },
username() { return Authentication.state.user.username },
userRole() { return Authentication.state.user.role },
},
methods: {
hideComponent () {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment