diff --git a/resources/assets/js/api/Api.js b/resources/assets/js/api/Api.js index e1c4577a7..268b6f76b 100644 --- a/resources/assets/js/api/Api.js +++ b/resources/assets/js/api/Api.js @@ -175,7 +175,8 @@ class Api { headers: { "Accept": "application/json", "Content-Type": "application/json", - "Authorization": `Bearer ` + credentials.accessToken + "Authorization": `Bearer ` + credentials.accessToken, + "Accept-Language": lang } }); } diff --git a/resources/assets/js/api/Filters.js b/resources/assets/js/api/Filters.js index e0ef9a995..42a003ce2 100644 --- a/resources/assets/js/api/Filters.js +++ b/resources/assets/js/api/Filters.js @@ -29,9 +29,10 @@ export let filters = { put(data) { return Api.put({ service: "PUT_MY_FILTERS", - id: data.id, data, - keys: {}, + keys: { + id: data.id, + }, }); }, /** diff --git a/resources/assets/js/api/Services.js b/resources/assets/js/api/Services.js index c7f15bb18..71183beb5 100644 --- a/resources/assets/js/api/Services.js +++ b/resources/assets/js/api/Services.js @@ -60,7 +60,7 @@ UNASSIGNED_LIST: "/home/unassigned", MY_FILTERS: "/cases/advanced-search/filters", POST_MY_FILTERS: "/cases/advanced-search/filter", - PUT_MY_FILTERS: "/cases/advanced-search/filter/", + PUT_MY_FILTERS: "/cases/advanced-search/filter/{id}", DELETE_MY_FILTERS: "/cases/advanced-search/filter/", SEARCH: "/home/search", PROCESSES: "/home/processes", diff --git a/resources/assets/js/components/search/AdvancedFilter.vue b/resources/assets/js/components/search/AdvancedFilter.vue index 5132be79e..042efddfa 100644 --- a/resources/assets/js/components/search/AdvancedFilter.vue +++ b/resources/assets/js/components/search/AdvancedFilter.vue @@ -608,7 +608,7 @@ export default { this.handleJumpTo(); }, onClick() { - if (this.id) { + if (this.id && this.id !== 'CASES_SEARCH') { this.updateData(this.id); } else { this.$refs['saveFilter'].show(); @@ -619,7 +619,9 @@ export default { * Delete Search handler */ onDeleteSearch() { - this.$emit("onRemoveFilter", this.id); + if (this.id && this.id !== 'CASES_SEARCH') { + this.$emit("onRemoveFilter", this.id); + } }, checkFormValidity() { const valid = this.$refs.form.checkValidity();