decidim-admin 0.30.0.rc3 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc29cc3a462ef48acdc919c381daf77729a0812fa6a9b2ec20dc3beb39a2395a
-  data.tar.gz: 2ff8e7ae1555b59e367e45df699d3a0e6587ab332f9c93ec89142d7b05a736d6
+  metadata.gz: b2daba5d2c690b03030a08511196d9ca36ebc870e8358f97d3161182013a42fd
+  data.tar.gz: d57c01e2f502d64c2ba1723af733ed39bd181f0a83412efaff63235acf49c248
 SHA512:
-  metadata.gz: 785a41246c5611c557618399411934dc97f83199c8b2414ab331c64df9837241f7d5fb4f329b0535e3cd775bb336adcba749c3addabebef4de25549d1e129f3c
-  data.tar.gz: 6181f1c0a56f33861f544316a1020d2d5a68a348a1f20e32b75ad6eeaac3de39dedff8d3ad1a0fefd626d1c8b04ee5e391eb89875c709d31776dab5783b9ae2b
+  metadata.gz: 8472029f6e4609819f6e09fdcca6413e35513c9b8091fe4fb12129137086ad1c67d40728a2bebec6e8fa10186fbfeb3a80e0b102e03639d5669c903a25901fb3
+  data.tar.gz: 7ddbe1c2eb351546b2b9d8fa5efdb59ade43f816bc487c728b1f33abb6801ee70095d6fae5d77a1f7e6c0e9b64e812041f5b3c2627328b0bd24d9099e8c018db

data/app/commands/decidim/admin/unhide_resource.rb

@@ -22,6 +22,7 @@ module Decidim
       #
       # Returns nothing.
       def call
+        return broadcast(:parent_invalid) if @reportable.respond_to?(:commentable) && @reportable.commentable.try(:hidden?)
         return broadcast(:invalid) unless unhideable?
 
         @with_admin_log ? unhide_with_admin_log! : unhide!

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

@@ -57,12 +57,17 @@ module Decidim
         Admin::UnhideResource.call(reportable, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("reportable.unhide.success", scope: "decidim.moderations.admin")
-            redirect_to moderations_path
+            redirect_to moderations_path(hidden: true)
+          end
+
+          on(:parent_invalid) do
+            flash[:alert] = I18n.t("reportable.unhide.parent_invalid", scope: "decidim.moderations.admin")
+            redirect_to moderations_path(hidden: true)
           end
 
           on(:invalid) do
-            flash.now[:alert] = I18n.t("reportable.unhide.invalid", scope: "decidim.moderations.admin")
-            redirect_to moderations_path
+            flash[:alert] = I18n.t("reportable.unhide.invalid", scope: "decidim.moderations.admin")
+            redirect_to moderations_path(hidden: true)
           end
         end
       end

data/app/events/decidim/parent_hidden_event.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ParentHiddenEvent < Decidim::ResourceHiddenEvent
+  end
+end

data/app/events/decidim/resource_hidden_event.rb

@@ -6,6 +6,10 @@ module Decidim
 
     i18n_attributes :resource_path, :report_reasons, :resource_type, :resource_content
 
+    def self.types
+      [:email]
+    end
+
     def resource_path
       @resource.reported_content_url
     end

data/app/permissions/decidim/admin/permissions.rb

@@ -3,6 +3,8 @@
 module Decidim
   module Admin
     class Permissions < Decidim::DefaultPermissions
+      include Decidim::UserRoleChecker
+
       def permissions
         return permission_action if managed_user_action?
 
@@ -31,6 +33,8 @@ module Decidim
 
         apply_global_moderations_permission_for_admin!
 
+        can_use_image_editor?
+
         if user.admin? && admin_terms_accepted?
           allow! if read_admin_log_action?
           allow! if read_user_statistics_action?
@@ -284,6 +288,10 @@ module Decidim
       def component
         context.fetch(:component, nil)
       end
+
+      def can_use_image_editor?
+        allow! if permission_action.subject == :editor_image && user_has_any_role?(user, nil, broad_check: true)
+      end
     end
   end
 end

data/app/views/decidim/admin/moderations/_moderation-tr.html.erb

@@ -44,7 +44,11 @@
       <%= icon_link_to "eye-line", hide_moderation_path(id: moderation), t("actions.hide", scope: "decidim.moderations"), class: "action-icon--hide", method: :put %>
     <% end %>
     <% if moderation.reportable.hidden? && allowed_to?(:unhide, authorization_scope) %>
-      <%= icon_link_to "eye-line", unhide_moderation_path(id: moderation), t("actions.unhide", scope: "decidim.moderations"), method: :put %>
+      <% if moderation.reportable.respond_to?(:commentable) && moderation.reportable.commentable.try(:hidden?) %>
+        <%= icon_with_tooltip "eye-line", t("actions.parent_hidden", scope: "decidim.moderations"), class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.parent_hidden", scope: "decidim.moderations") %>
+      <% else %>
+        <%= icon_link_to "eye-line", unhide_moderation_path(id: moderation), t("actions.unhide", scope: "decidim.moderations"), method: :put %>
+      <% end %>
     <% end %>
   </td>
 </tr>