diff options
| author | shpuld <shp@cock.li> | 2019-03-28 22:25:40 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-03-28 22:25:40 +0200 |
| commit | 31010779f6cc1abdd18fa117c0832e20623e1624 (patch) | |
| tree | 2eaf8861e1baee86a1f4d33e0e10543e62cdd98c /src/components/conversation-page | |
| parent | fd12263cacd2a869ad61dd8580f918b45d9b2a51 (diff) | |
| parent | c829b1a5f4a013882ba298b0f95ec0f8b3ed3758 (diff) | |
Merge branch 'develop' into feature/mobile-improvements-3
Diffstat (limited to 'src/components/conversation-page')
| -rw-r--r-- | src/components/conversation-page/conversation-page.js | 5 | ||||
| -rw-r--r-- | src/components/conversation-page/conversation-page.vue | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/components/conversation-page/conversation-page.js b/src/components/conversation-page/conversation-page.js index 8f1ac3d9..1da70ce9 100644 --- a/src/components/conversation-page/conversation-page.js +++ b/src/components/conversation-page/conversation-page.js @@ -1,5 +1,4 @@ import Conversation from '../conversation/conversation.vue' -import { find } from 'lodash' const conversationPage = { components: { @@ -8,8 +7,8 @@ const conversationPage = { computed: { statusoid () { const id = this.$route.params.id - const statuses = this.$store.state.statuses.allStatuses - const status = find(statuses, {id}) + const statuses = this.$store.state.statuses.allStatusesObject + const status = statuses[id] return status } diff --git a/src/components/conversation-page/conversation-page.vue b/src/components/conversation-page/conversation-page.vue index b03eea28..9e322cf5 100644 --- a/src/components/conversation-page/conversation-page.vue +++ b/src/components/conversation-page/conversation-page.vue @@ -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> |