bton/dev #69

Merged
j3d1 merged 5 commits from bton/dev into jedi/dev 2024-11-03 19:59:20 +00:00
Showing only changes of commit 24bd2bdd0a - Show all commits

View file

@ -15,23 +15,25 @@
Delete
</button-->
<div class="btn-group">
<select class="form-control" v-model="ticket.assigned_to">
<select class="form-control" v-model="selected_assignee">
<option v-for="user in users" :value="user.username">{{ user.username }}</option>
</select>
<button class="form-control btn btn-success"
@click="assignTicket(ticket)"
:disabled="!ticket.assigned_to">
:disabled="!selected_assignee && (selected_assignee == ticket.assigned_to)">
Assign&nbsp;Ticket
</button>
</div>
<div class="btn-group">
<select class="form-control" v-model="ticket.state">
<select class="form-control" v-model="selected_state">
<option v-for="status in state_options" :value="status.value">{{
status.text
}}
</option>
</select>
<button class="form-control btn btn-success" @click="changeTicketStatus(ticket)">
<button class="form-control btn btn-success"
@click="changeTicketStatus(ticket)"
:disabled="(selected_state == ticket.state)">
Change&nbsp;Status
</button>
</div>
@ -71,11 +73,20 @@ export default {
name: 'Ticket',
components: {AsyncLoader, ClipboardButton, Timeline},
data() {
return {
shipping_voucher_type: null
return {
selected_state: null,
Selected_assignee: null,
shipping_voucher_type: null,
}
},
computed: {
watch: {
ticket(val) {
if (this.selected_state == null){
this.selected_state = val.state;
}
}
},
computed: {
...mapState(['tickets', 'state_options', 'users']),
...mapGetters(['availableShippingVoucherTypes']),
ticket() {
@ -87,7 +98,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']),
@ -105,15 +116,17 @@ export default {
})
},
changeTicketStatus(ticket) {
this.updateTicketPartial({
ticket.state = this.selected_state;
this.updateTicketPartial({
id: ticket.id,
state: ticket.state
state: this.selected_state,
})
},
assignTicket(ticket) {
this.updateTicketPartial({
ticket.assigned_to = this.selected_assignee;
this.updateTicketPartial({
id: ticket.id,
assigned_to: ticket.assigned_to
assigned_to: this.selected_assignee
})
},
},