diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-06-20 13:02:04 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-06-20 13:02:04 +0000 |
| commit | 03a27c6d4864758d72f127138fa21961ef2b61fa (patch) | |
| tree | dbcd99332591acb875221d8609dca74713bbecab /src/components/poll/poll.vue | |
| parent | eca533aab68322a6bb3b4fd91e62709c66daaff4 (diff) | |
| parent | e5e9bb27f3a0825b695684a503ea7e5e75073734 (diff) | |
Merge branch 'fix/polls-to-module' into 'develop'
Move poll state handling to its own module
See merge request pleroma/pleroma-fe!845
Diffstat (limited to 'src/components/poll/poll.vue')
| -rw-r--r-- | src/components/poll/poll.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 4c765ae2..bb67101a 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -2,7 +2,7 @@ <div class="poll" v-bind:class="containerClass"> <div class="poll-option" - v-for="(option, index) in poll.options" + v-for="(option, index) in options" :key="index" > <div v-if="showResults" :title="resultTitle(option)" class="option-result"> @@ -50,7 +50,7 @@ {{totalVotesCount}} {{ $t("polls.votes") }} ยท </div> <i18n :path="expired ? 'polls.expired' : 'polls.expires_in'"> - <Timeago :time="this.poll.expires_at" :auto-update="60" :now-threshold="0" /> + <Timeago :time="this.expiresAt" :auto-update="60" :now-threshold="0" /> </i18n> </div> </div> |