Skip to content

Prevent Duplicate Options in 'Select Guidance' #3365

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.

Sign up for GitHub

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

Merged
benjaminfaure merged 3 commits into from
Apr 9, 2024
Merged

Prevent Duplicate Options in 'Select Guidance' #3365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d69584
Prevent duplicate options in 'Select Guidance'
aaronskiba Jan 15, 2024
7d04741
refactor / make rubocop happy
aaronskiba Jan 15, 2024
a3676ab
Add Changelog entries for PR #3365 and #3376
aaronskiba Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,14 @@ We sometimes use the button native Dom element to programmatically click, as the
- Fixed rubocop errors after Bootstrap upgrade
- Fixed RSpec tests after Bootstrap upgrade
- Fix "undefined" Tooltip Messages [#3364](https://github.com/DMPRoadmap/roadmap/pull/3364)
- Fixed rubocop errors after V4.1.1 release
- Fixed MySQL and PostgreSQL GitHub Actions [PR #3376](https://github.com/DMPRoadmap/roadmap/pull/3376)
- Removed duplicate `node-version:` statements from the `mysql.yml` and `postgres.yml` workflows
- Replaced `webdrivers` gem with `selenium-webdriver` gem
- Disabled `rack-attack` gem from throttling `/users/sign_in` path in Rails test environment
- Addressed `Faker` deprecation warnings
- Made some small changes to fix some existing tests
- Prevent Duplicate Options in 'Select Guidance' [PR #3365](https://github.com/DMPRoadmap/roadmap/pull/3365)

## V4.1.1

Expand Down
8 changes: 4 additions & 4 deletions app/controllers/plans_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ def show
end
@default_orgs = Org.default_orgs
@all_ggs_grouped_by_org.each do |org, ggs|
@important_ggs << [org, ggs] if @default_orgs.include?(org)

# If this is one of the already selected guidance groups its important!
@important_ggs << [org, ggs] if !(ggs & @selected_guidance_groups).empty? && !@important_ggs.include?([org, ggs])
# @default_orgs and already selected guidance groups are important.
if (@default_orgs.include?(org) || (ggs & @selected_guidance_groups).any?) && !@important_ggs.include?([org, ggs])
@important_ggs << [org, ggs]
end
end

# Sort the rest by org name for the accordion
Expand Down