decidim-admin 0.27.6 → 0.27.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac7830a2645388ae03864d86fb38168f35a78d55f54bd0604e036cc2c6ae0fc3
-  data.tar.gz: c79d6f340b53876b9f3d52ef0396d819020b605e74ff9c6f3d4e5928f724a448
+  metadata.gz: 05b4e853053e19c294d34bac72798acf0348feebae52ec2955d373bc939ed911
+  data.tar.gz: b89597557e962de240a917069ac429743d7a4554e3585379d58be7458e700c66
 SHA512:
-  metadata.gz: 0aeb935a256dcd62884e98e6cd195cbebec24b307998a58a12178455f7a8cbd8c8661ee938b38c85b99974d69b15b42c0862ed6c75426ae22712528b815bba9f
-  data.tar.gz: c79145b76878d87273d2bfaee29273a0af4e5d541d901258c746caa04cd5dc51faf5ef68f54c5e28a5c18db0a284668b48792c9c306964b2bc1142cead6be567
+  metadata.gz: 5a01b4503098fdcdf58c01614b1820bbd481078d8de1b1dc75f3e29bce3096434c06f78a790e26e2bdad821e4fdd0bc35f33d81c6ca93ea2fb5fb1ce2527b4cb
+  data.tar.gz: 96838c254ea3d1d73b5b8d7d89d60cd684783b4a839d4a090e0ed52e6cfa57ccf3e57ecc6d6bbf6e1ae9a14b4efc2dae0d5249da6a3527bc551a38efa82367c7

data/app/controllers/decidim/admin/authorization_workflows_controller.rb

@@ -8,7 +8,9 @@ module Decidim
       def index
         enforce_permission_to :index, :authorization_workflow
 
-        @workflows = Decidim::Verifications.admin_workflows
+        @workflows = Decidim::Verifications.admin_workflows.select do |manifest|
+          current_organization.available_authorizations.include?(manifest.name.to_s)
+        end
 
         # Decidim::Verifications::Authorizations Query
         @authorizations = Decidim::Verifications::Authorizations.new(

data/app/controllers/decidim/admin/impersonations_controller.rb

@@ -82,6 +82,7 @@ module Decidim
         return nil unless handler.unique_id
 
         existing_authorization = Authorization.find_by(
+          user: User.where(organization: current_organization),
           name: handler_name,
           unique_id: handler.unique_id
         )

data/app/controllers/decidim/admin/organization_controller.rb

@@ -44,13 +44,16 @@ module Decidim
         respond_to do |format|
           format.json do
             if (term = params[:term].to_s).present?
-              query = relation.order(name: :asc)
               query = if term.start_with?("@")
-                        query.where("nickname ILIKE ?", "#{term.delete("@")}%")
+                        nickname = term.delete("@")
+                        relation.where("nickname ILIKE ?", "#{nickname}%")
+                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("similarity(nickname, '#{nickname}') DESC")))
                       else
-                        query.where("name ILIKE ?", "%#{term}%").or(
-                          query.where("email ILIKE ?", "%#{term}%")
+                        relation.where("name ILIKE ?", "%#{term}%").or(
+                          relation.where("email ILIKE ?", "%#{term}%")
                         )
+                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("GREATEST(similarity(name, '#{term}'), similarity(email, '#{term}')) DESC")))
+                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("(similarity(name, '#{term}') + similarity(email, '#{term}')) / 2 DESC")))
                       end
               render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname})" } }
             else