#433 - fix broken conversation page
This commit is contained in:
parent
4cec0d589d
commit
6a9159b255
3 changed files with 13 additions and 5 deletions
|
@ -1,5 +1,9 @@
|
|||
<template>
|
||||
<conversation :collapsable="false" :statusoid="statusoid"></conversation>
|
||||
<conversation
|
||||
:collapsable="false"
|
||||
isPage="true"
|
||||
:statusoid="statusoid"
|
||||
></conversation>
|
||||
</template>
|
||||
|
||||
<script src="./conversation-page.js"></script>
|
||||
|
|
|
@ -31,7 +31,8 @@ const conversation = {
|
|||
},
|
||||
props: [
|
||||
'statusoid',
|
||||
'collapsable'
|
||||
'collapsable',
|
||||
'isPage'
|
||||
],
|
||||
computed: {
|
||||
status () {
|
||||
|
@ -49,7 +50,7 @@ const conversation = {
|
|||
return []
|
||||
}
|
||||
|
||||
if (!this.expanded) {
|
||||
if (!this.expanded && !this.isPage) {
|
||||
return [this.status]
|
||||
}
|
||||
|
||||
|
@ -79,6 +80,9 @@ const conversation = {
|
|||
i++
|
||||
return result
|
||||
}, {})
|
||||
},
|
||||
isExpanded () {
|
||||
return this.expanded || this.isPage
|
||||
}
|
||||
},
|
||||
components: {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div class="timeline panel-default" :class="[expanded ? 'panel' : 'panel-disabled']">
|
||||
<div v-if="expanded" class="panel-heading conversation-heading">
|
||||
<div class="timeline panel-default" :class="[isExpanded ? 'panel' : 'panel-disabled']">
|
||||
<div v-if="isExpanded" class="panel-heading conversation-heading">
|
||||
<span class="title"> {{ $t('timeline.conversation') }} </span>
|
||||
<span v-if="collapsable">
|
||||
<a href="#" @click.prevent="toggleExpanded">{{ $t('timeline.collapse') }}</a>
|
||||
|
|
Loading…
Reference in a new issue