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

Jump to bottom

Implement nested assemblies navigation #13662

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

Implement nested assemblies navigation #13662

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
da7e07c
Implement nested assemblies navigation
mllocs Nov 14, 2024
9aac1ea
Adjust responsiveness and remove link to assemblies
mllocs Nov 15, 2024
2790699
Fix redirect after creating assembly
mllocs Nov 15, 2024
a1170de
Merge branch 'develop' into feat/nested-assemblies
mllocs Nov 21, 2024
1d69005
Fix collapsing assemblies
mllocs Nov 26, 2024
f7730d5
Improve parent assembly selector by showing hierarchy
mllocs Nov 26, 2024
4682d55
Fix rubocop
mllocs Nov 26, 2024
dae824c
Fix xss issue in the select element
mllocs Nov 27, 2024
39b1546
Fix specs
mllocs Nov 27, 2024
08c9a1a
Fix specs
mllocs Nov 27, 2024
f293471
Change redirection path after duplicating assembly
mllocs Nov 29, 2024
c7b1011
Add specs for tree navigation
mllocs Nov 29, 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
Prev Previous commit
Next Next commit
Improve parent assembly selector by showing hierarchy
  • Loading branch information
@mllocs
mllocs committed Nov 26, 2024
commit f7730d55f042bb08d5da5cf82787fa81dd798a1c
32 changes: 28 additions & 4 deletions decidim-assemblies/app/helpers/decidim/assemblies/admin/assemblies_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,34 @@ def processes_selected
end
end

# Public: A collection of Assemblies that can be selected as parent
# assemblies for another assembly; to be used in forms.
def parent_assemblies_for_select
@parent_assemblies_for_select ||= ParentAssembliesForSelect.for(current_organization, current_assembly)
# Public: select options representing a collection of Assemblies that
# can be selected as parent assemblies for another assembly; to be used in forms.
def parent_assemblies_options
options = []
root_assemblies = ParentAssembliesForSelect.for(current_organization, current_assembly).where(parent_id: nil).sort_by(&:weight)

root_assemblies.each do |assembly|
build_assembly_options(assembly, options)
end

options
end

private

# Recursively build the options for the assembly tree
def build_assembly_options(assembly, options, level = 0)
name = " #{" " * 4 * level} #{assembly.translated_title}".html_safe
options << [name, assembly.id]

# Skip the current assembly to avoid selecting a child as parent
if assembly == current_assembly
return
end

assembly.children.each do |child|
build_assembly_options(child, options, level + 1)
end
end
end
end
Expand Down
7 changes: 1 addition & 6 deletions decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,7 @@
<% else %>
<div class="row column">
<%= form.select :parent_id,
options_from_collection_for_select(
parent_assemblies_for_select,
:id,
:translated_title,
selected: current_assembly.try(:parent_id)
),
parent_assemblies_options,
include_blank: t(".select_parent_assembly") %>
</div>
<% end %>
Expand Down
Loading