get back previews implementation for user_role_checker file

openpoke · Aug 13, 2024 · 43bbbb5 · 43bbbb5
1 parent 82e8c6d
commit 43bbbb5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/decidim-core/app/helpers/concerns/decidim/user_role_checker.rb b/decidim-core/app/helpers/concerns/decidim/user_role_checker.rb
@@ -21,23 +21,32 @@ def user_has_any_role?(user, participatory_space = nil)
 
     def participatory_process_user_role?(user, participatory_process = nil)
       return false unless Decidim.module_installed?(:participatory_processes)
-      return false unless participatory_process.is_a?(Decidim::ParticipatoryProcess)
 
-      Decidim::ParticipatoryProcessUserRole.exists?(user:, participatory_process:)
+      if participatory_process.is_a?(Decidim::ParticipatoryProcess)
+        Decidim::ParticipatoryProcessUserRole.exists?(user:, participatory_process:)
+      else
+        Decidim::ParticipatoryProcessUserRole.exists?(user:)
+      end
     end
 
     def assembly_user_role?(user, assembly = nil)
       return false unless Decidim.module_installed?(:assemblies)
-      return false unless assembly.is_a?(Decidim::Assembly)
 
-      Decidim::AssemblyUserRole.exists?(user:, assembly:)
+      if assembly.is_a?(Decidim::Assembly)
+        Decidim::AssemblyUserRole.exists?(user:, assembly:)
+      else
+        Decidim::AssemblyUserRole.exists?(user:)
+      end
     end
 
     def conference_user_role?(user, conference = nil)
       return false unless Decidim.module_installed?(:conferences)
-      return false unless conference.is_a?(Decidim::Conference)
 
-      Decidim::ConferenceUserRole.exists?(user:, conference:)
+      if conference.is_a?(Decidim::Conference)
+        Decidim::ConferenceUserRole.exists?(user:, conference:)
+      else
+        Decidim::ConferenceUserRole.exists?(user:)
+      end
     end
   end
 end
diff --git a/decidim-templates/spec/system/admin/admin_manages_proposal_bulk_answers_templates_spec.rb b/decidim-templates/spec/system/admin/admin_manages_proposal_bulk_answers_templates_spec.rb
@@ -120,6 +120,7 @@
 
   context "when templates is not installed" do
     before do
+      allow(Decidim).to receive(:module_installed?).and_call_original
       allow(Decidim).to receive(:module_installed?).with(:templates).and_return(false)
       visit current_path
       page.find(".js-check-all").set(true)