Skip to content

Commit

Permalink
Merge branch 'hotfix/1.3.2' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
adufr committed Aug 30, 2020
2 parents 4f886e3 + e1b186b commit 86a0d95
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "calendz-front",
"version": "1.3.0",
"version": "1.3.2",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
6 changes: 5 additions & 1 deletion src/services/calendar.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ const CalendarService = {

// TODO: recreate date object in order to make sure it has the right format
// /!\ date has to be of format: MM-DD-YY
return ApiCalendarService.get(`/week/${date}?firstname=${firstname}&lastname=${lastname}&ignoreCache=${force}`)
const url = force
? `/week/${date}?firstname=${firstname}&lastname=${lastname}&ignoreCache=true`
: `/week/${date}?firstname=${firstname}&lastname=${lastname}`

return ApiCalendarService.get(url)
.then(res => res.data)
.catch(err => Promise.reject(err.data))
}
Expand Down

0 comments on commit 86a0d95

Please sign in to comment.