hide and show dropdown actions

decidim · alecslupu · Dec 17, 2024 · Nov 19, 2024 · Nov 19, 2024 · Nov 20, 2024
commit 009fc3b94f6ccc9146e43b33ab1b7ed16aa83af0
diff --git a/decidim-admin/app/controllers/decidim/admin/moderated_users_controller.rb b/decidim-admin/app/controllers/decidim/admin/moderated_users_controller.rb
@@ -58,7 +58,7 @@ def reportable
       end
 
       def reportables
-        @reportables ||= base_query_finder.where(id: params[:user_id]).map(&:reportable)
+        @reportables ||= base_query_finder.where(id: params[:user_id])
       end
 
       def base_query_finder

diff --git a/decidim-admin/app/packs/src/decidim/admin/global_moderations.js b/decidim-admin/app/packs/src/decidim/admin/global_moderations.js
@@ -1,4 +1,6 @@
 /* eslint-disable no-invalid-this */
+/* eslint no-unused-vars: 0 */
+/* eslint id-length: ["error", { "exceptions": ["e"] }] */
 
 $(() => {
   const selectedModerationsCount = () => {

diff --git a/decidim-admin/app/views/decidim/admin/moderated_users/bulk_actions/_dropdown.html.erb b/decidim-admin/app/views/decidim/admin/moderated_users/bulk_actions/_dropdown.html.erb
@@ -17,7 +17,13 @@
     data-auto-focus="false"
     data-events="resize">
     <ul>
-      <% if allowed_to?(:block, :moderate_users) %>
+      <% if params[:blocked] %>
+        <li>
+          <button type="button" data-action="unblock-moderated_users">
+            <%= t("decidim.admin.moderated_users.index.actions.bulk_actions.unblock.title") %>
+          </button>
+        </li>
+      <% else %>
         <li>
           <button type="button" data-action="block-moderated_users">
             <%= t("decidim.admin.moderated_users.index.actions.bulk_actions.block.title") %>
@@ -29,11 +35,6 @@
           </button>
         </li>
       <% end %>
-        <li>
-          <button type="button" data-action="unblock-moderated_users">
-            <%= t("decidim.admin.moderated_users.index.actions.bulk_actions.unblock.title") %>
-          </button>
-        </li>
     </ul>
   </div>
 </div>
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
@@ -715,7 +715,7 @@ en:
               unblock:
                 title: Unblock
                 update_moderated_user_button: Unblock users
-              unreport: 
+              unreport:
                 title: Unreport
             ignore:
               update_moderated_user_button: Unreport users