potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Fix accessing group event unlogged

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2021-02-05 14:45:39 +01:00
parent 8ce3cccfa4
commit 6a063cf655
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
3 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
js/src/components/Comment/Comment.vue
View file

@ -296,11 +296,9 @@ export default class Comment extends Vue {
}
get commentFromOrganizer(): boolean {
return (
this.event.organizerActor !== undefined &&
this.comment.actor != null &&
this.comment.actor.id === this.event.organizerActor.id
);
const organizerId =
this.event?.organizerActor?.id || this.event?.attributedTo?.id;
return organizerId !== undefined && this.comment?.actor?.id === organizerId;
}
get commentId(): string {

10
js/src/components/Comment/CommentTree.vue
View file

@ -320,11 +320,9 @@ export default class CommentTree extends Vue {
}
get isEventOrganiser(): boolean {
return (
this.currentActor.id !== undefined &&
this.event.organizerActor !== undefined &&
this.currentActor.id === this.event.organizerActor.id
);
const organizerId =
this.event?.organizerActor?.id || this.event?.attributedTo?.id;
return organizerId !== undefined && this.currentActor?.id === organizerId;
}
get areCommentsClosed(): boolean {
@ -335,7 +333,7 @@ export default class CommentTree extends Vue {
}
get isAbleToComment(): boolean {
if (this.currentActor && this.currentActor.id) {
if (this.currentActor?.id) {
return this.areCommentsClosed || this.isEventOrganiser;
}
return false;

16
js/src/views/Event/Edit.vue
View file

@ -579,7 +579,7 @@ export default class EditEvent extends Vue {
}
private getDefaultActor() {
if (this.event.organizerActor && this.event.organizerActor.id) {
if (this.event.organizerActor?.id) {
return this.event.organizerActor;
}
return this.currentActor;
@ -725,7 +725,7 @@ export default class EditEvent extends Vue {
get isCurrentActorOrganizer(): boolean {
return !(
this.eventId &&
this.event.organizerActor &&
this.event.organizerActor?.id !== undefined &&
this.currentActor.id !== this.event.organizerActor.id
) as boolean;
}
@ -822,19 +822,17 @@ export default class EditEvent extends Vue {
}
get attributedToEqualToOrganizerActor(): boolean {
return (this.event.organizerActor &&
this.event.attributedTo &&
this.event.attributedTo.id === this.event.organizerActor.id) as boolean;
return (this.event.organizerActor?.id !== undefined &&
this.event.attributedTo?.id === this.event.organizerActor?.id) as boolean;
}
/**
* Build variables for Event GraphQL creation query
*/
private async buildVariables() {
this.event.organizerActor =
this.event.organizerActor && this.event.organizerActor.id
? this.event.organizerActor
: this.currentActor;
this.event.organizerActor = this.event.organizerActor?.id
? this.event.organizerActor
: this.currentActor;
let res = this.event.toEditJSON();
if (this.event.organizerActor) {
res = Object.assign(res, {