Skip to content

Commit

Permalink
Merge branch 'frontend-collab-tests' into 'main'
Browse files Browse the repository at this point in the history
Frontend collab tests

See merge request reportcreator/reportcreator!722
  • Loading branch information
MWedl committed Oct 1, 2024
2 parents f9d17d6 + 461b0f8 commit c524e9e
Show file tree
Hide file tree
Showing 7 changed files with 731 additions and 199 deletions.
2 changes: 1 addition & 1 deletion api/src/reportcreator_api/pentests/consumers.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class UserNotesConsumer(NotesConsumerBase):
async def get_related_id(self):
user_id = self.scope['url_route']['kwargs']['pentestuser_pk']
if user_id == 'self':
return self.user.id
return getattr(self.user, 'id', None)
else:
return user_id

Expand Down
1 change: 1 addition & 0 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion frontend/src/stores/shareinfos.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export const useShareInfoStore = defineStore('shareinfo', {
},
actions: {
clear() {
this.useNotesCollab().disconnect();
this.data = null;
},
async fetchById(shareId: string) {
Expand Down
Loading

0 comments on commit c524e9e

Please sign in to comment.