Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Close meetings from inside #3869

Merged
merged 21 commits into from
Aug 6, 2024
Merged

Conversation

reiterl
Copy link
Member

@reiterl reiterl commented Jul 17, 2024

Resolve #3622

Needs:

Draft version with setting, dashboard, meeting list, committee detail changes, and disable setting for templates

@reiterl reiterl added this to the 4.2 milestone Jul 17, 2024
@reiterl reiterl self-assigned this Jul 17, 2024
@Elblinator
Copy link
Member

Elblinator commented Jul 23, 2024

client-side:

@reiterl
Copy link
Member Author

reiterl commented Jul 29, 2024

As far as I understand the PermissionGuard it forbids entering meetings, if you are not superadmin and not in the meeting (in one group).
My last commit added the delete user note.
Open so far:

  • export meeting should not be allowed for closed meetings
  • user.assign meeting, closed meetings should be filtered from selection.

@reiterl reiterl marked this pull request as ready for review July 29, 2024 11:02
@reiterl
Copy link
Member Author

reiterl commented Jul 30, 2024

So long, so good. We need a test, what is missing here. @Elblinator pls test and @bastianjoel pls review.

@reiterl reiterl assigned Elblinator and bastianjoel and unassigned reiterl Jul 30, 2024
@Elblinator Elblinator mentioned this pull request Jul 30, 2024
7 tasks
Copy link
Member

@Elblinator Elblinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only apply if the meeting is locked from the inside...

Orga-level > Committee-detail:

  • in the three dot menu > Hide "Public template", "Duplicate" and "export"
  • Relevant for committee admins (who are not meeting admins): Hide the "edit option"
  • Relevant for superadmins (who are not meeting admins):
    • id the edit meeting view is opened then disable all meeting specific info besides the Superadmin settings

Orga-level > account-list > multi-select:

  • select account > "Set/remove meeting ..." > The locked meeting is still in that list and selectable, please also hide the locked meetings from that list

I was not able to test the meeting-level. So I still need to do that

@reiterl reiterl assigned Elblinator and unassigned reiterl Jul 31, 2024
@reiterl
Copy link
Member Author

reiterl commented Jul 31, 2024

I worked on the CR. Introduced some changes for the committee-meeting-preview and the 'Set/remove meetings'
bulk action.

Copy link
Member

@Elblinator Elblinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only for superadmins:
in the committee detail view the edit option for closed meetings should still be visible even if the superadmin is not a meeting admin

@Elblinator Elblinator assigned reiterl and unassigned Elblinator Aug 1, 2024
@reiterl
Copy link
Member Author

reiterl commented Aug 1, 2024

Okay, updated the PR to allow superadmins to see meeting-edit even if not in the meeting.

@bastianjoel bastianjoel assigned reiterl and unassigned bastianjoel and Elblinator Aug 5, 2024
@reiterl reiterl assigned bastianjoel and Elblinator and unassigned reiterl Aug 5, 2024
@reiterl
Copy link
Member Author

reiterl commented Aug 5, 2024

I have updated the way to get the meeting membership. I now use groups. So no need to load the long user_ids list.

@bastianjoel bastianjoel removed their assignment Aug 5, 2024
Copy link
Member

@Elblinator Elblinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still needs some discussion and a green light from @emanuelschuetze

@Elblinator Elblinator merged commit 4bde3ca into OpenSlides:main Aug 6, 2024
3 checks passed
@reiterl reiterl deleted the 3622-closed-meetings branch August 6, 2024 08:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Meeting: closed meetings
3 participants