diff --git a/app/modules/epics/dashboard/epic-row/epic-row.controller.coffee b/app/modules/epics/dashboard/epic-row/epic-row.controller.coffee index 76c8ca24..b4a01dc7 100644 --- a/app/modules/epics/dashboard/epic-row/epic-row.controller.coffee +++ b/app/modules/epics/dashboard/epic-row/epic-row.controller.coffee @@ -40,13 +40,12 @@ class EpicRowController if @.epic.getIn(['status_extra_info', 'is_closed']) == true @.percentage = "100%" else - opened = @.epic.getIn(['user_stories_counts', 'opened']) - closed = @.epic.getIn(['user_stories_counts', 'closed']) - total = opened + closed + progress = @.epic.getIn(['user_stories_counts', 'progress']) + total = @.epic.getIn(['user_stories_counts', 'total']) if total == 0 @.percentage = "0%" else - @.percentage = "#{closed * 100 / total}%" + @.percentage = "#{progress * 100 / total}%" canEditEpics: () -> return @projectService.hasPermission("modify_epic") diff --git a/app/modules/epics/dashboard/epic-row/epic-row.controller.spec.coffee b/app/modules/epics/dashboard/epic-row/epic-row.controller.spec.coffee index f3df7c64..a4a6e275 100644 --- a/app/modules/epics/dashboard/epic-row/epic-row.controller.spec.coffee +++ b/app/modules/epics/dashboard/epic-row/epic-row.controller.spec.coffee @@ -68,8 +68,8 @@ describe "EpicRow", -> is_closed: false } user_stories_counts: { - opened: 10, - closed: 10 + total: 10, + progress: 5 } }) } @@ -83,8 +83,8 @@ describe "EpicRow", -> is_closed: false } user_stories_counts: { - opened: 0, - closed: 0 + total: 10, + progress: 0 } }) } diff --git a/app/modules/epics/dashboard/epic-row/epic-row.jade b/app/modules/epics/dashboard/epic-row/epic-row.jade index 7497be1c..db4f1147 100644 --- a/app/modules/epics/dashboard/epic-row/epic-row.jade +++ b/app/modules/epics/dashboard/epic-row/epic-row.jade @@ -27,7 +27,7 @@ ) tg-svg( svg-icon="icon-arrow-down" - ng-if="vm.epic.getIn(['user_stories_counts', 'opened']) || vm.epic.getIn(['user_stories_counts', 'closed'])" + ng-if="vm.epic.getIn(['user_stories_counts', 'total'])" ) .project(ng-if="vm.column.project")