diff --git a/core/tickets/api_v2.py b/core/tickets/api_v2.py
index f8f746e..319a047 100644
--- a/core/tickets/api_v2.py
+++ b/core/tickets/api_v2.py
@@ -22,6 +22,11 @@ class IssueViewSet(viewsets.ModelViewSet):
queryset = IssueThread.objects.all()
+class CommentViewSet(viewsets.ModelViewSet):
+ serializer_class = CommentSerializer
+ queryset = Comment.objects.all()
+
+
class ShippingVoucherViewSet(viewsets.ModelViewSet):
serializer_class = ShippingVoucherSerializer
queryset = ShippingVoucher.objects.all()
@@ -118,6 +123,7 @@ def add_comment(request, pk):
router = routers.SimpleRouter()
router.register(r'tickets', IssueViewSet, basename='issues')
+#router.register(r'comments', CommentViewSet, basename='comments')
router.register(r'shipping_vouchers', ShippingVoucherViewSet, basename='shipping_vouchers')
urlpatterns = ([
diff --git a/core/tickets/models.py b/core/tickets/models.py
index db427fe..8a559ee 100644
--- a/core/tickets/models.py
+++ b/core/tickets/models.py
@@ -1,5 +1,5 @@
-from django.db import models
from django.utils import timezone
+from django.db import models
from django_softdelete.models import SoftDeleteModel
from authentication.models import ExtendedUser
diff --git a/web/src/components/CollapsableCards.vue b/web/src/components/CollapsableCards.vue
index a982e3a..554a960 100644
--- a/web/src/components/CollapsableCards.vue
+++ b/web/src/components/CollapsableCards.vue
@@ -83,6 +83,13 @@ export default {
} else {
this.collapsed = this.sections.map(() => true);
}
+
+ //this.$router.push({...this.$router.currentRoute, query: {...this.$router.currentRoute.query, layout}});
+ //this.collapsed = this.sections.map(() => true);
+ /*this.columns.map(e => ({
+ k: e,
+ v: this.$store.getters.getFilters[e]
+ })).filter(e => e.v).forEach(e => this.setFilter(e.k, e.v));*/
},
computed: {
grouped_items() {
diff --git a/web/src/components/Toast.vue b/web/src/components/Toast.vue
index e69de29..062c69a 100644
--- a/web/src/components/Toast.vue
+++ b/web/src/components/Toast.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/src/router.js b/web/src/router.js
index 2e69122..871a01c 100644
--- a/web/src/router.js
+++ b/web/src/router.js
@@ -4,6 +4,7 @@ import store from '@/store';
import Items from './views/Items';
import Boxes from './views/Boxes';
import Files from './views/Files';
+import Error from './views/Error';
import HowTo from './views/HowTo';
import Login from '@/views/Login.vue';
import Register from '@/views/Register.vue';
diff --git a/web/src/shared-state-plugin/index.js b/web/src/shared-state-plugin/index.js
index 2baffd6..67397d0 100644
--- a/web/src/shared-state-plugin/index.js
+++ b/web/src/shared-state-plugin/index.js
@@ -88,7 +88,6 @@ export default (config) => {
}
/** may only be called from worker */
-
const worker_fun = function (self, ctx) {
/* globals WebSocket, SharedWorker, onconnect, onmessage, postMessage, close, location */
diff --git a/web/src/store.js b/web/src/store.js
index fcb7ee8..d1d10c5 100644
--- a/web/src/store.js
+++ b/web/src/store.js
@@ -51,6 +51,7 @@ const store = createStore({
afterInitHandlers: [],
showAddBoxModal: false,
+ test: ['foo', 'bar', 'baz'],
shippingVoucherTypes: {
'2kg-de': '2kg Paket (DE)',
@@ -59,8 +60,7 @@ const store = createStore({
'2kg-eu': '2kg Paket (EU)',
'5kg-eu': '5kg Paket (EU)',
'10kg-eu': '10kg Paket (EU)',
- },
- test: ['foo', 'bar', 'baz'],
+ }
},
getters: {
route: state => router.currentRoute.value,
@@ -215,6 +215,9 @@ const store = createStore({
user.permissions = null;
state.user = user;
},
+ setTest(state, test) {
+ state.test = test;
+ },
setThumbnail(state, {url, data}) {
state.thumbnailCache[url] = data;
},
@@ -477,7 +480,6 @@ const store = createStore({
dispatch('fetchMessageTemplates');
}
},
-
async fetchShippingVouchers({commit, state}) {
if (!state.user.token) return;
if (state.fetchedData.shippingVouchers > Date.now() - 1000 * 60 * 60 * 24) return;