duplicate org name in guidance choices

[StCyr]

see DMPbelgium/roadmap#87

[nicolasfranck]

A bit more clarity:

• on the plan edit page, you see a "short" list of available guidance groups, grouped by organization. We noticed that if the logged in user is of the same organization as one of the default organizations, that organization is listed twice in that list. Possible reason is here:

if @all_ggs_grouped_by_org.include?(current_user.org)
    # <- ADDED HERE
    @important_ggs << [current_user.org, @all_ggs_grouped_by_org[current_user.org]]
end
@default_orgs = Org.default_orgs
@all_ggs_grouped_by_org.each do |org, ggs|
    # <- ADDED HERE
    @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])
end

Possibly fixed by applying @import_ggs.uniq! at the end?

• The full list of guidance groups is fine, as that is not created with previous logic, but from the database itself.

[aaronskiba]

Just noticed this while doing the upgrade to v4.0.0. I guess the duplicate choice occurs when current_user.org is included in @default_orgs.

Maybe the entire code snippet you shared could be refactored to something like the following?:

BEFORE

if @all_ggs_grouped_by_org.include?(current_user.org)
    # <- ADDED HERE
    @important_ggs << [current_user.org, @all_ggs_grouped_by_org[current_user.org]]
end
@default_orgs = Org.default_orgs
@all_ggs_grouped_by_org.each do |org, ggs|
    # <- ADDED HERE
    @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])
end

AFTER

    @default_orgs = Org.default_orgs
    @all_ggs_grouped_by_org.each do |org, ggs|
      # add to important_ggs if org is current_user.org or a default_org, or if ggs is already a selected guidance group
      if @default_orgs.include?(org) || (org == current_user.org) || !(ggs & @selected_guidance_groups).empty?
        @important_ggs << [org, ggs]
      end
    end