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.

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

fix: Scopes not updatable in the back-office #640

Merged
merged 2 commits into from
Nov 28, 2024
Merged

fix: Scopes not updatable in the back-office #640

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d271f1
fix: Remove unnecessaries overrides that broke the feature
AyakorK Nov 27, 2024
474f643
Merge branch 'develop' into fix/scopes_not_modified
luciegrau Nov 28, 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
7 changes: 2 additions & 5 deletions app/helpers/concerns/decidim/simple_proposal/scopes_helper_override.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ module Decidim
module SimpleProposal
module ScopesHelperOverride
extend ActiveSupport::Concern

included do
def scopes_picker_field(form, name, root: false, options: { checkboxes_on_top: true, sort_by_weight: true })
def scopes_picker_field(form, name, root: false, options: { checkboxes_on_top: true })
options.merge!(selected: selected_scope(form)) if selected_scope(form)
form.select(name, simple_scope_options(root: root, options: options), include_blank: t("decidim.scopes.prompt"))
end
Expand All @@ -23,11 +22,9 @@ def selected_scope(form)
def simple_scope_options(root: false, options: {})
scopes_array = []
roots = root ? root.children : ancestors

roots.sort_by { |ancestor| ancestor.weight || 0 }.each do |ancestor|
children_after_parent(ancestor, scopes_array, "")
end

selected = options.has_key?(:selected) ? options[:selected] : params.dig(:filter, :decidim_scope_id)
options_for_select(scopes_array, selected)
end
Expand All @@ -37,7 +34,7 @@ def ancestors
end

def children_after_parent(ancestor, array, prefix)
array << ["#{prefix} #{translated_attribute(ancestor.name)}", ancestor.id, ancestor.weight]
array << ["#{prefix} #{translated_attribute(ancestor.name)}", ancestor.id]
ancestor.children.sort_by { |child| child.weight || 0 }.each do |child|
children_after_parent(child, array, "#{prefix}-")
end
Expand Down
Loading