aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-04-04 21:50:30 +0200
committerGitHub2018-04-04 21:50:30 +0200
commit8a3f5a06566be4fe52518cd16c1f79407744d32a (patch)
tree383028c8b7a1972b2864137570a02f52774053e0
parentfe8e3583fd2a135a14fad6cc27cc089d76b7946e (diff)
parentbd475af5453a0215d249e7a4b662e1334ed033a2 (diff)
downloadchouette-core-8a3f5a06566be4fe52518cd16c1f79407744d32a.tar.bz2
Merge pull request #443 from af83/6405-allow-timtables-without-periods
6405 Allow for Timetables & Calendars without periods
-rw-r--r--app/javascript/time_tables/actions/index.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/time_tables/actions/index.js b/app/javascript/time_tables/actions/index.js
index 3127d11b8..7c79dfe52 100644
--- a/app/javascript/time_tables/actions/index.js
+++ b/app/javascript/time_tables/actions/index.js
@@ -306,10 +306,11 @@ const actions = {
})
},
errorModalKey: (periods, dayTypes) => {
- const withoutPeriodsWithDaysTypes = reject(periods, 'deleted').length == 0 && some(dayTypes) && "withoutPeriodsWithDaysTypes"
+ // const withoutPeriodsWithDaysTypes = reject(periods, 'deleted').length == 0 && some(dayTypes) && "withoutPeriodsWithDaysTypes"
const withPeriodsWithoutDayTypes = reject(periods, 'deleted').length > 0 && every(dayTypes, dt => dt == false) && "withPeriodsWithoutDayTypes"
- return (withoutPeriodsWithDaysTypes || withPeriodsWithoutDayTypes) && (withoutPeriodsWithDaysTypes ? "withoutPeriodsWithDaysTypes" : "withPeriodsWithoutDayTypes")
+ // return (withoutPeriodsWithDaysTypes || withPeriodsWithoutDayTypes) && (withoutPeriodsWithDaysTypes ? "withoutPeriodsWithDaysTypes" : "withPeriodsWithoutDayTypes")
+ return withPeriodsWithoutDayTypes
},
errorModalMessage: (errorKey) => {