le-village-du-possible/ArenMg
2
0
Fork 0
mirror of https://github.com/ArenMg/aren.git synced 2024-11-21 16:10:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Arimihanta 2021-07-11 15:58:43 +03:00
commit c1e8f2b058
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/webapp/assets/js/components/modals/passwordModal.vue
View file

@ -43,7 +43,9 @@
mounted() {
this.$nextTick(() => {
if (this.$route.query.resetPassword && this.$route.query.token) {
this.open();
setTimeout(()=>{
this.open()
}, 2000)
}
});
},

2
src/main/webapp/assets/js/components/widgets/comment.vue
View file

@ -49,7 +49,7 @@
<button
v-if="
($root.user.is('ADMIN') || $root.user.is('MODO')) &&
($root.user.is('ADMIN') || $root.user.is('MODO') || (comment.owner.id == $root.user.id) ) &&
comment.comments.length < 1
"
title="Supprimer le commentaire"