Backport 'Sort valuator selectors by valuator name' to v0.28 (decidim…

…#13652) * Sort valuator selectors by valuator name * Fix specs * Fix pipeline --------- Co-authored-by: Màxim Colls <[email protected]>
AjuntamentdeBarcelona · Nov 14, 2024 · c12ffd2 · c12ffd2
1 parent b38422b
commit c12ffd2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/decidim-assemblies/app/models/decidim/assembly.rb b/decidim-assemblies/app/models/decidim/assembly.rb
@@ -154,7 +154,7 @@ def closed?
     end
 
     def user_roles(role_name = nil)
-      roles = Decidim::AssemblyUserRole.where(assembly: self_and_ancestors)
+      roles = Decidim::AssemblyUserRole.order_by_name.where(assembly: self_and_ancestors)
       return roles if role_name.blank?
 
       roles.where(role: role_name)

diff --git a/decidim-conferences/app/models/decidim/conference.rb b/decidim-conferences/app/models/decidim/conference.rb
@@ -136,7 +136,7 @@ def closed?
     end
 
     def user_roles(role_name = nil)
-      roles = Decidim::ConferenceUserRole.where(conference: self)
+      roles = Decidim::ConferenceUserRole.order_by_name.where(conference: self)
       return roles if role_name.blank?
 
       roles.where(role: role_name)

diff --git a/decidim-core/lib/decidim/participatory_space_user.rb b/decidim-core/lib/decidim/participatory_space_user.rb
@@ -37,6 +37,10 @@ def target_space_association
         raise "Not implemented"
       end
 
+      def self.order_by_name
+        includes(:user).order("decidim_users.name ASC")
+      end
+
       private
 
       # Private: check if the process and the user have the same organization

diff --git a/decidim-participatory_processes/app/models/decidim/participatory_process.rb b/decidim-participatory_processes/app/models/decidim/participatory_process.rb
@@ -193,7 +193,7 @@ def self.moderators(organization)
     end
 
     def user_roles(role_name = nil)
-      roles = Decidim::ParticipatoryProcessUserRole.where(participatory_process: self)
+      roles = Decidim::ParticipatoryProcessUserRole.order_by_name.where(participatory_process: self)
       return roles if role_name.blank?
 
       roles.where(role: role_name)