diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-05-04 13:59:27 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-05-04 13:59:27 +0000 |
| commit | 8e1c5841e98094c9801f3dc378195af9e3541493 (patch) | |
| tree | c086fb400f7ac7ad6d693ee3d04684e9dc44150b /src/components/user_card | |
| parent | 0438031da44a70816716de40625541d569a49c85 (diff) | |
| parent | 9787d996722e44e6554d936e0995bf4c346207e2 (diff) | |
Merge branch '441-reporting' into 'develop'
Reporting
Closes #441
See merge request pleroma/pleroma-fe!695
Diffstat (limited to 'src/components/user_card')
| -rw-r--r-- | src/components/user_card/user_card.js | 3 | ||||
| -rw-r--r-- | src/components/user_card/user_card.vue | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index 1a100de3..7c6ffa89 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -151,6 +151,9 @@ export default { }, userProfileLink (user) { return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames) + }, + reportUser () { + this.$store.dispatch('openUserReportingModal', this.user.id) } } } diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index e62b384d..2d02ca03 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -99,8 +99,14 @@ </button> </span> </div> - <ModerationTools :user='user' v-if='loggedIn.role === "admin"'> - </ModerationTools> + <div class='block' v-if='isOtherUser && loggedIn'> + <span> + <button @click="reportUser"> + {{ $t('user_card.report') }} + </button> + </span> + </div> + <ModerationTools :user='user' v-if='loggedIn.role === "admin"'/> </div> </div> </div> |