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

Make duplicate-from mandatory, if 'required_duplicate_from' is set #3851

Merged
merged 17 commits into from
Jul 30, 2024

Conversation

reiterl
Copy link
Member

@reiterl reiterl commented Jul 15, 2024

Resolve #3804

Needs OpenSlides/openslides-backend#2524
and an updated autoupdate service

@Elblinator
Copy link
Member

the issue from the autoupdate
OpenSlides/openslides-autoupdate-service#959

@Elblinator
Copy link
Member

Elblinator commented Jul 15, 2024

I'm testing this right now, I need to wait for the meta :D

but please fix the tests

@reiterl
Copy link
Member Author

reiterl commented Jul 15, 2024

I think, for the tests this needs the backend and meta pr merged.

@reiterl reiterl removed their assignment Jul 15, 2024
@luisa-beerboom luisa-beerboom removed their assignment Jul 16, 2024
@Elblinator
Copy link
Member

A change request:

  • A committee admin should be able to set themselves as a meeting admin even if this setting is activated
    Reproduction:
  1. Create a meeting where the committee admin is not an admin from the meeting
  2. activate the new setting
  3. login as the committee admin
  4. start editing this meeting
  5. you can select yourself as an admin but you cannot save the meeting

Some requirements were not documented and now need some implementing in this PR:
If the new setting is activated then (only for the committee admin)....

  • The button to turn a meeting into a template/ turn a meeting not into a meeting should be hidden
  • The option to duplicate a meeting should be hidden

@Elblinator Elblinator assigned reiterl and unassigned bastianjoel and Elblinator Jul 17, 2024
reiterl added 3 commits July 22, 2024 14:02
If committee manager and require_duplicate_from set, the cm is not
allowed to clone/duplicate and set template.
@reiterl reiterl requested a review from luisa-beerboom July 22, 2024 12:45
@Elblinator Elblinator removed their assignment Jul 23, 2024
@bastianjoel bastianjoel removed their assignment Jul 23, 2024
@bastianjoel bastianjoel removed their request for review July 23, 2024 13:40
@Elblinator Elblinator requested a review from MSoeb July 24, 2024 06:16
@luisa-beerboom luisa-beerboom removed their assignment Jul 24, 2024
Copy link

@MSoeb MSoeb left a comment

Choose a reason for hiding this comment

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

Issue I've found:

  • Meeting creation with or without the new function activated creates two error messages in the console. The creation works, but the creation mask isn't closed after saving it. Tried it as superadmin and committee admin. Doesn't worked properly for both admins.

Here the error messages:
image

Reproduction as superadmin:

  1. open committee > create a committee
  2. open dev-console
  3. create a meeting in the committee -> error messages will appear and the creation doesn't closed automatically.

What should happen:

  1. Creation mask should close itself by saving it and open the committee detail page
  2. error messages should not appear in console

Please change the texts of the new function from

  • "Activate require templates for creating a meeting" to 'Enable meeting creation from templates only'
  • 'If this setting is active committee-admins can only create meetings from public meeting templates, to enable these admins to create a meeting you need to create a template meeting first' to 'If this setting is activated, public meeting templates must have been created, as committee administrators can only create meetings based on public templates.'

@MSoeb MSoeb self-requested a review July 26, 2024 14:00
MSoeb
MSoeb previously requested changes Jul 26, 2024
Copy link

@MSoeb MSoeb left a comment

Choose a reason for hiding this comment

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

Loading bugs are gone, but the text ajdustments need to be done. They are located in the general instance settings:

  • "Activate require templates for creating a meeting" to 'Enable meeting creation from templates only'

  • 'If this setting is active committee-admins can only create meetings from public meeting templates, to enable these admins to create a meeting you need to create a template meeting first' to 'If this setting is activated, public meeting templates must have been created, as committee administrators can only create meetings based on public templates.'


Additionally:
If the setting is activated and a committee admin wants to create a meeting from templates, a non-essential element, a dash, is displayed in the 'Duplicate from' selection. I have circled these in red in the image below.

image

What should happen?
If the new setting is activated, committee admins should only see templates in the 'Duplicate from' selection, all other information can be deleted as it is unnecessary. Specifically: Please delete the dash option.

@reiterl
Copy link
Member Author

reiterl commented Jul 29, 2024

Rename the labels.
Deactivate the includeNone option of the meeting selector.

@reiterl
Copy link
Member Author

reiterl commented Jul 29, 2024

Please review again.

@luisa-beerboom luisa-beerboom removed their assignment Jul 29, 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.

@MSoeb changes were made and I will dismiss his CR

@Elblinator Elblinator dismissed MSoeb’s stale review July 29, 2024 10:15

Changes were made

@reiterl
Copy link
Member Author

reiterl commented Jul 30, 2024

Are the AU and meta merges missing?

@Elblinator Elblinator merged commit 23bad8f into OpenSlides:main Jul 30, 2024
2 checks passed
@reiterl reiterl deleted the 3804-require-duplicate-from branch July 31, 2024 05:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Meeting.create: make duplicate from (optionally) mandatory
5 participants