commit: f685f9021bfaff71616efd8e83d114441e69701b
parent 4c11ac9a27696a7fe57eeb486257d8f7c1295548
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Thu, 26 Oct 2023 23:48:45 +0000
Merge branch 'fix-reports' into 'develop'
fix reports now showing reason
See merge request pleroma/pleroma-fe!1860
Diffstat:
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changelog.d/fix-reports.fix b/changelog.d/fix-reports.fix
@@ -0,0 +1 @@
+fix reports now showing reason/content:w
diff --git a/src/components/report/report.js b/src/components/report/report.js
@@ -1,6 +1,7 @@
import Select from '../select/select.vue'
import StatusContent from '../status_content/status_content.vue'
import Timeago from '../timeago/timeago.vue'
+import RichContent from 'src/components/rich_content/rich_content.jsx'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
const Report = {
@@ -10,10 +11,12 @@ const Report = {
components: {
Select,
StatusContent,
- Timeago
+ Timeago,
+ RichContent
},
computed: {
report () {
+ console.log(this.$store.state.reports.reports[this.reportId] || {})
return this.$store.state.reports.reports[this.reportId] || {}
},
state: {