diff --git a/core/tickets/models.py b/core/tickets/models.py index 4e388de..be694d1 100644 --- a/core/tickets/models.py +++ b/core/tickets/models.py @@ -55,12 +55,6 @@ def create_issue_thread(sender, instance, created, **kwargs): if created: StateChange.objects.create(issue_thread=instance, state='pending_new') - class Meta: - permissions = [ - ('send_mail', 'Can send mail'), - ('add_issuethread_manual', 'Can add issue thread manually'), - ] - class Comment(models.Model): id = models.AutoField(primary_key=True) diff --git a/web/src/router.js b/web/src/router.js index 5fb55e2..fde986d 100644 --- a/web/src/router.js +++ b/web/src/router.js @@ -68,10 +68,6 @@ const routes = [ path: 'users/', name: 'users', component: AccessControl, meta: {requiresAuth: true, requiresPermission: 'delete_event'} }, - { - path: 'boxes/', name: 'admin_boxes', component: BoxesAdmin, meta: - {requiresAuth: true, requiresPermission: 'delete_event'} - }, ] }, {path: '/user', name: 'user', component: Empty, meta: {requiresAuth: true}}, diff --git a/web/src/store/index.js b/web/src/store/index.js index 5808e38..44a09c0 100644 --- a/web/src/store/index.js +++ b/web/src/store/index.js @@ -110,14 +110,12 @@ const store = new Vuex.Store({ }, isLoggedIn(state) { if (!state.local_loaded) { - state.remember = localStorage.getItem('remember') === 'true'; - state.user = localStorage.getItem('user'); - //state.password = localStorage.getItem('password'); - state.userPermissions = JSON.parse(localStorage.getItem('permissions') || '[]'); - state.token = localStorage.getItem('token'); - state.token_expiry = localStorage.getItem('token_expiry'); - state.local_loaded = true; - axios.defaults.headers.common['Authorization'] = `Token ${state.token}`; + state.remember = localStorage.getItem('remember') === 'true' + state.user = localStorage.getItem('user') + state.userPermissions = JSON.parse(localStorage.getItem('permissions') || '[]') + state.token = localStorage.getItem('token') + state.token_expiry = localStorage.getItem('token_expiry') + state.local_loaded = true } return state.user !== null && state.token !== null; @@ -236,7 +234,7 @@ const store = new Vuex.Store({ body: JSON.stringify({username: username, password: password}), credentials: 'omit' }).then(r => r.json()) - if (data && data.token) { + if (data.token) { commit('setToken', data); commit('setUser', username); commit('setPassword', password); @@ -253,14 +251,14 @@ const store = new Vuex.Store({ }, async reloadToken({commit, state}) { try { - if (state.password) { + if (data.password) { const data = await fetch('/api/2/login/', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({username: state.user, password: state.password}), credentials: 'omit' - }).then(r => r.json()).catch(e => console.error(e)) - if (data && data.token) { + }).then(r => r.json()) + if (data.token) { commit('setToken', data); axios.defaults.headers.common['Authorization'] = `Token ${data.token}`; return true;