IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2472 from Human-Connection/quickfix_for_nullpointer_error_in_user_vue

Browse Source 
Quick fix for null pointer error in User.vue
This commit is contained in:
mattwr18 2019-12-10 15:51:11 +01:00 committed by GitHub
commit 4293fb845b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webapp/components/User/User.vue
View File

@ -8,7 +8,7 @@
<dropdown v-else :class="{ 'disabled-content': user.disabled }" placement="top-start" offset="0"> <dropdown v-else :class="{ 'disabled-content': user.disabled }" placement="top-start" offset="0">
<template slot="default" slot-scope="{ openMenu, closeMenu, isOpen }"> <template slot="default" slot-scope="{ openMenu, closeMenu, isOpen }">
<nuxt-link :to="userLink" :class="['user', isOpen && 'active']"> <nuxt-link :to="userLink" :class="['user', isOpen && 'active']">
<div @mouseover="openInfoMenu" @mouseleave="closeMenu(true)"> <div @mouseover="showPopover ? openMenu(true) : () => {}" @mouseleave="closeMenu(true)">
<hc-avatar v-if="showAvatar" class="avatar" :user="user" /> <hc-avatar v-if="showAvatar" class="avatar" :user="user" />
<div> <div>
<ds-text class="userinfo"> <ds-text class="userinfo">
@ -26,7 +26,7 @@
</div> </div>
</nuxt-link> </nuxt-link>
</template> </template>
<template slot="popover" v-if="showCounts"> <template slot="popover" v-if="showPopover">
<div style="min-width: 250px"> <div style="min-width: 250px">
<hc-badges v-if="user.badges && user.badges.length" :badges="user.badges" /> <hc-badges v-if="user.badges && user.badges.length" :badges="user.badges" />
<ds-text <ds-text
@ -106,7 +106,7 @@ export default {
showAvatar: { type: Boolean, default: true }, showAvatar: { type: Boolean, default: true },
trunc: { type: Number, default: 18 }, // "-1" is no trunc trunc: { type: Number, default: 18 }, // "-1" is no trunc
dateTime: { type: [Date, String], default: null }, dateTime: { type: [Date, String], default: null },
showCounts: { type: Boolean, default: true }, showPopover: { type: Boolean, default: true },
}, },
computed: { computed: {
...mapGetters({ ...mapGetters({
@ -143,9 +143,6 @@ export default {
this.user.followedByCount = followedByCount this.user.followedByCount = followedByCount
this.user.followedByCurrentUser = followedByCurrentUser this.user.followedByCurrentUser = followedByCurrentUser
}, },
openInfoMenu() {
if (this.showCounts) this.openMenu(true)
},
}, },
} }
</script> </script>

1
webapp/components/features/FiledReportsTable/FiledReportsTable.vue
View File

@ -10,6 +10,7 @@
<hc-user <hc-user
:user="scope.row.submitter" :user="scope.row.submitter"
:showAvatar="false" :showAvatar="false"
:showPopover="false"
:trunc="30" :trunc="30"
data-test="filing-user" data-test="filing-user"
/> />

6
webapp/components/features/ReportRow/ReportRow.vue
View File

@ -19,7 +19,7 @@
<!-- Content Column --> <!-- Content Column -->
<td class="ds-table-col" data-test="report-content"> <td class="ds-table-col" data-test="report-content">
<client-only v-if="isUser"> <client-only v-if="isUser">
<hc-user :user="report.resource" :showAvatar="false" :trunc="30" :showCounts="false" /> <hc-user :user="report.resource" :showAvatar="false" :trunc="30" :showPopover="false" />
</client-only> </client-only>
<nuxt-link v-else class="title" :to="linkTarget"> <nuxt-link v-else class="title" :to="linkTarget">
{{ linkText | truncate(50) }} {{ linkText | truncate(50) }}
@ -33,7 +33,7 @@
:user="report.resource.author" :user="report.resource.author"
:showAvatar="false" :showAvatar="false"
:trunc="30" :trunc="30"
:showCounts="false" :showPopover="false"
/> />
</client-only> </client-only>
<span v-else>—</span> <span v-else>—</span>
@ -51,7 +51,7 @@
:showAvatar="false" :showAvatar="false"
:trunc="30" :trunc="30"
:date-time="report.updatedAt" :date-time="report.updatedAt"
:showCounts="false" :showPopover="false"
/> />
</client-only> </client-only>
</td> </td>