mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-12 13:24:25 +00:00
Fixed: [activity] fetch all the available location, beyond the first page
This commit is contained in:
parent
af5f27ff49
commit
68f7a832b4
@ -28,7 +28,7 @@ class LocationController extends CRUDController
|
|||||||
|
|
||||||
protected function customizeQuery(string $action, Request $request, $query): void
|
protected function customizeQuery(string $action, Request $request, $query): void
|
||||||
{
|
{
|
||||||
$query->where('e.availableForUsers = true'); //TODO not working
|
$query->where('e.availableForUsers = "TRUE"');
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
|
protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import VueMultiselect from 'vue-multiselect';
|
import VueMultiselect from 'vue-multiselect';
|
||||||
import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
|
import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods';
|
||||||
import { mapState, mapGetters } from 'vuex';
|
import { mapState, mapGetters } from 'vuex';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@ -58,23 +58,17 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getOptions() {
|
getOptions() {
|
||||||
const url = `/api/1.0/main/location.json`;
|
fetchResults(`/api/1.0/main/location.json`)
|
||||||
makeFetch('GET', url)
|
|
||||||
.then(response => {
|
.then(response => {
|
||||||
let options = response.results;
|
let uniqueLocationTypeId = [...new Set(response.map(o => o.locationType.id))];
|
||||||
let uniqueLocationTypeId = [...new Set(options.map(o => o.locationType.id))];
|
|
||||||
let results = [];
|
let results = [];
|
||||||
for (let id of uniqueLocationTypeId) {
|
for (let id of uniqueLocationTypeId) {
|
||||||
results.push({
|
results.push({
|
||||||
locationCategories: options.filter(o => o.locationType.id === id)[0].locationType.title.fr,
|
locationCategories: response.filter(o => o.locationType.id === id)[0].locationType.title.fr,
|
||||||
locations: options.filter(o => o.locationType.id === id)
|
locations: response.filter(o => o.locationType.id === id)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
this.options = results;
|
this.options = results;
|
||||||
return response;
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
this.$toast.open({message: error.txt})
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
updateAdminLocation(value) {
|
updateAdminLocation(value) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user