diff --git a/client/components/repository/Workflow/Overview/index.vue b/client/components/repository/Workflow/Overview/index.vue index fbf0d0841..681e9feae 100644 --- a/client/components/repository/Workflow/Overview/index.vue +++ b/client/components/repository/Workflow/Overview/index.vue @@ -10,7 +10,12 @@ - + @@ -36,7 +41,7 @@ import OverviewDueDate from './DueDate'; import OverviewName from './Name'; import OverviewPriority from './Priority'; import OverviewStatus from './Status'; -import PublishingBadge from '@/components/repository/common/Sidebar/Badge'; +import Publishing from '@/components/repository/common/Sidebar/Publishing'; import selectActivity from '@/components/repository/common/selectActivity'; export default { @@ -47,7 +52,7 @@ export default { }, computed: { ...mapGetters(['isAdmin']), - ...mapGetters('repository', ['isRepositoryAdmin', 'workflow']), + ...mapGetters('repository', ['isRepositoryAdmin', 'workflow', 'outlineActivities']), headers() { return [{ text: 'Name', @@ -105,7 +110,7 @@ export default { } }, components: { - PublishingBadge, + Publishing, OverviewAssignee, OverviewDueDate, OverviewName, diff --git a/client/components/repository/common/Sidebar/Badge.vue b/client/components/repository/common/Sidebar/Badge.vue deleted file mode 100644 index 18d8c5da3..000000000 --- a/client/components/repository/common/Sidebar/Badge.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - {{ descendantsInfo }} - {{ activityInfo }} - - - - - - diff --git a/client/components/repository/common/Sidebar/Publishing.vue b/client/components/repository/common/Sidebar/Publishing.vue index 941d36027..e13e29fc6 100644 --- a/client/components/repository/common/Sidebar/Publishing.vue +++ b/client/components/repository/common/Sidebar/Publishing.vue @@ -22,28 +22,49 @@ - - - - {{ isPublishing ? publishStatus.message : publishedAtMessage }} - + + + + + + + {{ isPublishing ? publishStatus.message : publishDetails }} + + + + + {{ publishedAtMessage }} + + - -