Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-29 01:55:01 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into cire16

Browse Source
This commit is contained in:
Julien Fastré
2022-12-22 10:22:58 +01:00
parent d3e784de15 f7fa9c31f3
commit 7a1cc9b076
801 changed files with 39243 additions and 6591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
View File

@@ -58,7 +58,7 @@ const makeAccompanyingPeriodLocation = (locationType, store) => {
export default function prepareLocations(store) {
// find the locations
// find the locations
let allLocations = getLocations().then(
(results) => {
store.commit('addAvailableLocationGroup', {
@@ -114,7 +114,7 @@ export default function prepareLocations(store) {
if (window.default_location_id) {
for (let group of store.state.availableLocations) {
let location = group.locations.find((l) => l.id === window.default_location_id);
if (location !== undefined & store.state.activity.location === null) {
if (location !== undefined && store.state.activity.location === null) {
store.dispatch('updateLocation', location);
break;
}