diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-28 11:13:17 -0500 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-28 11:13:17 -0500 |
commit | 8b265aa3cadf9a9c4727495ff4fa9f2aa3a39375 (patch) | |
tree | 80bc416f34414b4aba116969273651253dceadd8 | |
parent | 94a74e79cb087cc499add60ab638d999bc7e3815 (diff) | |
download | gitlab-ce-8b265aa3cadf9a9c4727495ff4fa9f2aa3a39375.tar.gz |
Show dashes when date is empty
-rw-r--r-- | app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 index b9675f50e31..0d85e1a4678 100644 --- a/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6 @@ -10,10 +10,15 @@ }, template: ` <span class="total-time"> - <template v-if="time.days">{{ time.days }} <span>{{ time.days === 1 ? 'day' : 'days' }}</span></template> - <template v-if="time.hours">{{ time.hours }} <span>hr</span></template> - <template v-if="time.mins && !time.days">{{ time.mins }} <span>mins</span></template> - <template v-if="time.seconds && Object.keys(time).length === 1 || time.seconds === 0">{{ time.seconds }} <span>s</span></template> + <template v-if="Object.keys(time).length"> + <template v-if="time.days">{{ time.days }} <span>{{ time.days === 1 ? 'day' : 'days' }}</span></template> + <template v-if="time.hours">{{ time.hours }} <span>hr</span></template> + <template v-if="time.mins && !time.days">{{ time.mins }} <span>mins</span></template> + <template v-if="time.seconds && Object.keys(time).length === 1 || time.seconds === 0">{{ time.seconds }} <span>s</span></template> + </template> + <template v-else> + -- + </template> </span> `, }); |