kopia lustrzana https://github.com/nextcloud/social
Restore follow button in user lists
Signed-off-by: Louis Chemineau <louis@chmn.me>pull/1744/head
rodzic
e9f9957a6d
commit
c7a1189ee0
|
@ -72,10 +72,6 @@ export default {
|
||||||
currentUser,
|
currentUser,
|
||||||
],
|
],
|
||||||
props: {
|
props: {
|
||||||
account: {
|
|
||||||
type: String,
|
|
||||||
default: '',
|
|
||||||
},
|
|
||||||
uid: {
|
uid: {
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
<!-- Hack to render note safely -->
|
<!-- Hack to render note safely -->
|
||||||
<MessageContent v-if="accountInfo.note" class="user-profile__note user-profile__info" :item="{content: accountInfo.note, tag: [], mentions: []}" />
|
<MessageContent v-if="accountInfo.note" class="user-profile__note user-profile__info" :item="{content: accountInfo.note, tag: [], mentions: []}" />
|
||||||
|
|
||||||
<FollowButton class="user-profile__info" :account="accountInfo.acct" :uid="uid" />
|
<FollowButton class="user-profile__info" :uid="uid" />
|
||||||
<NcButton v-if="serverData.public"
|
<NcButton v-if="serverData.public"
|
||||||
class="user-profile__info primary"
|
class="user-profile__info primary"
|
||||||
@click="followRemote">
|
@click="followRemote">
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
<!-- eslint-disable-next-line vue/no-v-html -->
|
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||||
<p v-html="item.note" />
|
<p v-html="item.note" />
|
||||||
</div>
|
</div>
|
||||||
<FollowButton :account="item.acct" :uid="cloudId" />
|
<FollowButton :uid="item.acct" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -61,6 +61,7 @@
|
||||||
<script>
|
<script>
|
||||||
import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
|
import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
|
||||||
import currentUser from '../mixins/currentUserMixin.js'
|
import currentUser from '../mixins/currentUserMixin.js'
|
||||||
|
import accountMixins from '../mixins/accountMixins.js'
|
||||||
import FollowButton from './FollowButton.vue'
|
import FollowButton from './FollowButton.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
@ -70,6 +71,7 @@ export default {
|
||||||
NcAvatar,
|
NcAvatar,
|
||||||
},
|
},
|
||||||
mixins: [
|
mixins: [
|
||||||
|
accountMixins,
|
||||||
currentUser,
|
currentUser,
|
||||||
],
|
],
|
||||||
props: {
|
props: {
|
||||||
|
@ -92,6 +94,11 @@ export default {
|
||||||
return !this.item.acct.includes('@')
|
return !this.item.acct.includes('@')
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
async mounted() {
|
||||||
|
if (this.relationship === undefined) {
|
||||||
|
await this.$store.dispatch('fetchAccountRelationshipInfo', [this.item.id])
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
|
Ładowanie…
Reference in New Issue