diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index f3f3038..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "web/extras"] - path = web/extras - url = https://git.neulandlabor.de/j3d1/vue-extras.git diff --git a/core/mail/migrations/0005_alter_eventaddress_event.py b/core/mail/migrations/0005_alter_eventaddress_event.py deleted file mode 100644 index 30b79bf..0000000 --- a/core/mail/migrations/0005_alter_eventaddress_event.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.2.7 on 2024-11-03 18:30 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0004_alter_event_created_at_alter_item_created_at'), - ('mail', '0004_alter_emailattachment_file'), - ] - - operations = [ - migrations.AlterField( - model_name='eventaddress', - name='event', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='addresses', to='inventory.event'), - ), - ] diff --git a/deploy/dev/.backend.env b/deploy/dev/.backend.env deleted file mode 100644 index bfddc4a..0000000 --- a/deploy/dev/.backend.env +++ /dev/null @@ -1 +0,0 @@ -HTTP_HOST=core \ No newline at end of file diff --git a/web/src/components/AsyncLoader.vue b/web/src/components/AsyncLoader.vue index 06c5908..00bf841 100644 --- a/web/src/components/AsyncLoader.vue +++ b/web/src/components/AsyncLoader.vue @@ -130,4 +130,4 @@ export default { transform: translate(24px, 0); } } - + \ No newline at end of file diff --git a/web/src/views/Ticket.vue b/web/src/views/Ticket.vue index 629ede8..39f5a71 100644 --- a/web/src/views/Ticket.vue +++ b/web/src/views/Ticket.vue @@ -15,25 +15,21 @@ Delete
- -
- -
@@ -73,23 +69,11 @@ export default { name: 'Ticket', components: {AsyncLoader, ClipboardButton, Timeline}, data() { - return { - selected_state: null, - selected_assignee: null, - shipping_voucher_type: null, + return { + shipping_voucher_type: null } }, - watch: { - ticket(val) { - if (this.selected_state == null){ - this.selected_state = val.state; - }; - if(this.selected_assignee == null){ - this.selected_assignee = val.assigned_to - } - } - }, - computed: { + computed: { ...mapState(['tickets', 'state_options', 'users']), ...mapGetters(['availableShippingVoucherTypes']), ticket() { @@ -101,7 +85,7 @@ export default { const domain = document.location.hostname; return `ticket+${this.ticket.uuid}@${domain}`; } - }, + }, methods: { ...mapActions(['deleteItem', 'markItemReturned', 'sendMail', 'updateTicketPartial', 'postComment']), ...mapActions(['loadTickets', 'fetchTicketStates', 'loadUsers', 'scheduleAfterInit']), @@ -119,17 +103,15 @@ export default { }) }, changeTicketStatus(ticket) { - ticket.state = this.selected_state; - this.updateTicketPartial({ + this.updateTicketPartial({ id: ticket.id, - state: this.selected_state, + state: ticket.state }) }, assignTicket(ticket) { - ticket.assigned_to = this.selected_assignee; - this.updateTicketPartial({ + this.updateTicketPartial({ id: ticket.id, - assigned_to: this.selected_assignee + assigned_to: ticket.assigned_to }) }, }, @@ -142,4 +124,4 @@ export default { + \ No newline at end of file