Automatically enable registrations when meeting is "on this platform"#6874
Merged
tramuntanal merged 1 commit intodecidim:developfrom Nov 24, 2020
Conversation
Contributor
|
@decidim/product can you review this? It builds on top of #6662, which allowed users to set a registration type but didn't actually open the registrations, so users couldn't join the meeting. This PR opens the registrations as state in the description. There's a link to the review app in the description. Thanks! |
Member
Contributor
|
@decidim/core this has been approved by @decidim/product, can you review it please? 😄 |
microstudi
pushed a commit
to Platoniq/decidim
that referenced
this pull request
Jan 12, 2021
microstudi
added a commit
to Platoniq/decidim
that referenced
this pull request
Jan 12, 2021
* Add online meetings (decidim#6572) * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * Address feedback * Fix i18n * Remove config option * test: select the type of meeting before filling in location * Move URL details to cell * Fix form * Fix icon * Fix edit form Co-authored-by: Marc Riera Casals <mrc2407@gmail.com> Co-authored-by: David Morcillo <david.morcillo@gmail.com> # Conflicts: # decidim-meetings/app/commands/decidim/meetings/create_meeting.rb * Add registration system (decidim#6662) * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * WIP added registration options to meetings form * fixing specs and merging branch * Fix en.yml file * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * Address feedback * Fix i18n * Remove config option * fix failing specs * test: select the type of meeting before filling in location * remove extra stuff from conflicts * fix example length lint error * Resolving comments * removing duplicate code * remove trailing white space * Changing migration file * Remove component setting to allow external registration * adding functionality to the registration button * Add join meeting button for external registration for users * Join meeting button fix * fix failing specs * fix the default error on form * remove unwanted stuff * Fix locale fail * fix specs * Merging develop and resolving conflicts * Fix specs and lints * refactor: use constants from model * fix: only show default locale for registration terms in meeting form Co-authored-by: Marc Riera Casals <mrc2407@gmail.com> Co-authored-by: David Morcillo <david.morcillo@gmail.com> Co-authored-by: Andrea Orler <andrea@codegram.com> # Conflicts: # decidim-forms/app/views/decidim/forms/admin/questionnaires/edit.html.erb # decidim-meetings/app/presenters/decidim/meetings/meeting_presenter.rb * feat: automatically enalble registrations when meeting on this platform (decidim#6874) * Allow creation of hybrid meetings (decidim#6891) * Add Hybrid meeting events * Normalize translations * Run Linters * Fixing I18n Key error * Fixing Failing test * Running linters * Running linters * Add Geocoder setup for hybrid meetings * Fix issue with filter defaults # Conflicts: # decidim-meetings/app/models/decidim/meetings/meeting.rb # decidim-meetings/app/services/decidim/meetings/meeting_search.rb * Feature/15596 embed jitsi meeting (#65) * Stub embedded jitsi videoconference * Add embedded jitsi videoconference component * Improve toolbar items control * Remove iframe when videoconference over * Use user role for videoconference * Don't show videoconference if visitors not allowed * Fix erb * Fix rubocop offenses * Add button to start meeting * Log meetings attendance * Remove whitespace * Add videoconference setttings templates and docs * Display "Embedded videoconference" in meeting card * Set jitsi domain and api_url in config * Fix offenses * Log attendance * Make rubocop happy * Show attendance logs in admin * Add missing value in secrets template * Remove whitespace * Normalize locale * Don't require custom jitsi variables * Add spec for permissions * Make embedded videoconference an additional option for meetings * Refactor permissions for embedded_videoconference as boolean * Update commands and form * Fix initializer defining empty videoconferences hash * Update meetings form * Improve meeting public page * Rename js component for videoconference * Improve class comment for attendance log command * Simplify cell * Improve index for logs * Simplify videoconference cell * Add spec for videoconference cell * Fix rubocop offenses * Change parent class for VideoconferenceAttendanceLogsController * Fix rubocop offenses * Normalize locales * Fix missing and unused locale errors * Add spec for create videoconference attendance log command * Add spec for create videoconference attendance logs command * Update meeting form spec * Update meeting model spec * Add spec for videoconference attendance log model * Update spec for admin manage meetings * Lint js * Add spec for viewing attendance logs * Normalize locale * Add system spec for videoconference * Add consent message to videoconference explanation * Add missing translations * Fix create meeting spec * Fix update meeting command spec * Prevent authenticity token error * Fix toggle for embed videoconference checkbox * Fix embed checkbox toggle * Add seeds for embedded videoconference meetings * Fix variable name Co-authored-by: Vera Rojman <vrojman@protonmail.com> # Conflicts: # decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb # decidim-meetings/config/locales/en.yml # decidim-meetings/lib/decidim/meetings/component.rb # decidim-meetings/spec/models/meeting_spec.rb # docs/services/videoconferences.md * Add a config flag to disable the registration code (decidim#6698) * Ref. DIFE-148 - add registration_code_enabled as an admin flag on meetings settings page - remove registration code from email and notification - do not display registration code on the interface after joining to a meeting * Ref. DIFE-148 - hide "Validate registration code" from Admin - Components - Meeting section * Ref. DIFE-148 - fix rspec error * Ref. DIFE-148 - fix bad reference * Ref. DIFE-148 - fix tests for join_meeting_spec.rb * Ref. DIFE-148 - fix tests for meeting_registrations_spec.rb * Ref. DIFE-148 - fix tests for registration_mailer_spec.rb * Ref. DIFE-148 - fix tests for admin_manages_meetings_spec.rb * Ref. DIFE-148 - fix tests for validate_registration_code_spec.rb * Ref. DIFE-148 - fix linter errors * Add functionality to enable/disable registration code. * Add unit tests and fix the old ones. * Add PR number to Change Log * Updating the i18n tasks * Fixing i18n specs * Running linters on Changelog.md * run linters * Fixing Linking issues * Remove changes done in CHANGELOG.md * Ref. DIFE-148 - add registration_code_enabled as an admin flag on meetings settings page - remove registration code from email and notification - do not display registration code on the interface after joining to a meeting * Ref. DIFE-148 - hide "Validate registration code" from Admin - Components - Meeting section * Ref. DIFE-148 - fix bad reference * Ref. DIFE-148 - fix tests for join_meeting_spec.rb * Ref. DIFE-148 - fix tests for meeting_registrations_spec.rb * Ref. DIFE-148 - fix tests for registration_mailer_spec.rb * Ref. DIFE-148 - fix tests for admin_manages_meetings_spec.rb * Ref. DIFE-148 - fix tests for validate_registration_code_spec.rb * Add functionality to enable/disable registration code. * Add PR number to Change Log * Running linters on Changelog.md * run linters * Fixing Linking issues * Remove changes done in CHANGELOG.md * Remove changes done in CHANGELOG.md * Set flag's default value to TRUE and remove duplicate entries * Fix tests after changing the default value of flag Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> Co-authored-by: Cristian Georgescu <georgescu.cristi@gmail.com> * fix merge error * fix merge errors * fix more merge errors Co-authored-by: anagha vl <44900292+anaghavl@users.noreply.github.com> Co-authored-by: Andrea Orler <orlera@users.noreply.github.com> Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> Co-authored-by: roxanaopr <66411127+roxanaopr@users.noreply.github.com> Co-authored-by: Cristian Georgescu <georgescu.cristi@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎩 What? Why?
#6662 allowed a user to create a meeting selecting a registration type ("Registrations disabled", "On this platform", "On a different platform").
When the user creates a meeting with registration type "On this platform", though, the registrations would never be opened (nor the 'JOIN MEETING' button shown).
This PR automatically opens the registrations for meetings created from the public area when the registration type is "On this platform" by setting the
registration_enabledflag totrue.Notice that the other two options ("Registrations disabled", "On a different platform") where already working correctly and are not affected by the current changes.
📌 Related Issues
Link your PR to an issue
Testing
REVIEW APP: https://decidim-staging-pr-241.herokuapp.com/
📋 Checklist
🚨 Please review the guidelines for contributing to this repository.
docs/.📷 Screenshots
Please add screenshots of the changes you're proposing
