aboutsummaryrefslogtreecommitdiffstats
path: root/app/javascript
diff options
context:
space:
mode:
authorcedricnjanga2018-04-04 14:55:25 -0700
committerGitHub2018-04-04 14:55:25 -0700
commitc327d2ec90851bfe1f81c072ef328bd68ea55f38 (patch)
tree89a52107e5fe4bef33fa273fc32240dcc9901986 /app/javascript
parentf04d4420053dc995bad52b5b87ff7f15e302c2b3 (diff)
parent461e1b085e745e819e95649bf3509ca6055ce827 (diff)
downloadchouette-core-c327d2ec90851bfe1f81c072ef328bd68ea55f38.tar.bz2
Merge branch 'master' into 6370-translations-26370-translations-2
Diffstat (limited to 'app/javascript')
-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) => {