CSEC_PUBLIC/catalyst
1
0
Fork 0
mirror of https://github.com/SecurityBrewery/catalyst.git synced 2025-12-07 15:52:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dashboard redirect (#32)

Browse Source
This commit is contained in:
Jonas Plum
2022-02-17 21:51:54 +01:00
committed by GitHub
parent 599b9d3c6e
commit 54312893a2
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ui/src/components/TicketList.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<v-row v-if="type" class="mx-0 my-2" dense> <v-row v-if="selectedtype" class="mx-0 my-2" dense>
<v-col :cols="this.$route.params.id ? 4 : 2"> <v-col :cols="this.$route.params.id ? 4 : 2">
<v-select <v-select
v-model="selectedtype" v-model="selectedtype"
@@ -16,9 +16,9 @@
height="48px"></v-select> height="48px"></v-select>
</v-col> </v-col>
<v-col :cols="this.$route.params.id ? 8 : 10"> <v-col :cols="this.$route.params.id ? 8 : 10">
<v-btn elevation="0" rounded class="float-right mb-2" @click="opennew({ name: 'Ticket', params: { type: type, id: 'new' } })"> <v-btn elevation="0" rounded class="float-right mb-2" @click="opennew({ name: 'Ticket', params: { type: selectedtype, id: 'new' } })">
<v-icon class="mr-1">mdi-plus</v-icon> <v-icon class="mr-1">mdi-plus</v-icon>
New {{ type | capitalize }} New {{ selectedtype | capitalize }}
</v-btn> </v-btn>
</v-col> </v-col>
</v-row> </v-row>
@@ -92,7 +92,6 @@
<template v-slot:item="{ item }"> <template v-slot:item="{ item }">
<tr @click="open(item)"> <tr @click="open(item)">
<td colspan="5" class="pa-0"> <td colspan="5" class="pa-0">
<!--ticketSnippet :ticket="item" class="pa-0"></ticketSnippet-->
<v-list-item :to="{ name: 'Ticket', params: { type: item.type, id: item.id } }" class="pa-0" style="background: none"> <v-list-item :to="{ name: 'Ticket', params: { type: item.type, id: item.id } }" class="pa-0" style="background: none">
<ticketSnippet :ticket="item"></ticketSnippet> <ticketSnippet :ticket="item"></ticketSnippet>
</v-list-item> </v-list-item>
@@ -110,7 +109,6 @@ import { API } from "@/services/api";
import TicketSnippet from "../components/snippets/TicketSnippet.vue"; import TicketSnippet from "../components/snippets/TicketSnippet.vue";
import {validateCAQL} from "@/suggestions/suggestions"; import {validateCAQL} from "@/suggestions/suggestions";
import {DateTime} from "luxon"; import {DateTime} from "luxon";
import router from "vue-router";
interface State { interface State {
term: string; term: string;
@@ -237,13 +235,10 @@ export default Vue.extend({
deep: true, deep: true,
}, },
selectedtype: function () { selectedtype: function () {
// this.type = this.selectedtype; this.loadTickets();
(this.$router as any).history.current = router.START_LOCATION;
this.$router.push({ name: "TicketList", params: { type: this.selectedtype } });
}, },
$route: function () { $route: function () {
this.selectedtype = this.type; this.selectedtype = this.type;
this.loadTickets();
}, },
}, },
methods: { methods: {
@@ -298,7 +293,7 @@ export default Vue.extend({
sortDesc = this.options.sortDesc; sortDesc = this.options.sortDesc;
} }
let ticketType = this.type; let ticketType = this.selectedtype;
if (!ticketType) { if (!ticketType) {
ticketType = ""; ticketType = "";
} }

2
ui/src/components/snippets/TicketSnippet.vue
View File

@@ -27,7 +27,7 @@
<span class="mr-1">{{ ticket.references ? ticket.references.length : 0 }}</span> <span class="mr-1">{{ ticket.references ? ticket.references.length : 0 }}</span>
</v-list-item-subtitle> </v-list-item-subtitle>
</v-list-item-content> </v-list-item-content>
<v-list-item-action v-if="action !== ''"> <v-list-item-action v-if="action">
<v-btn icon small> <v-btn icon small>
<v-icon small @click="actionClick">{{ action }}</v-icon> <v-icon small @click="actionClick">{{ action }}</v-icon>
</v-btn> </v-btn>