Merge pull request #362 from codeforjapan/develop

Fix error in /debates/versions
codeforjapan · Apr 11, 2022 · 52fd425 · 52fd425
2 parents f381ae2 + a28bdf7
commit 52fd425
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/decidim/debates/versions_controller.rb b/app/controllers/decidim/debates/versions_controller.rb
@@ -16,7 +16,7 @@ def versioned_resource
 
       def show
         description = current_version.object_changes
-        if description.size > OBJECT_CHANGE_SIZE_LIMIT
+        if description && description.size > OBJECT_CHANGE_SIZE_LIMIT
           flash[:alert] = I18n.t("debates.versions.too_large_changeset", scope: "decidim.debates")
           redirect_to action: :index
         end

diff --git a/app/models/decidim/user_base_entity.rb b/app/models/decidim/user_base_entity.rb
@@ -52,7 +52,11 @@ def only_public(klass, ids)
       scope = klass.where(id: ids)
       scope = scope.public_spaces if klass.try(:participatory_space?)
       scope = scope.includes(:component) if klass.try(:has_component?)
-      scope = scope.filter(&:visible?) if klass.method_defined?(:visible?)
+      begin
+        scope = scope.filter(&:visible?) if klass.method_defined?(:visible?)
+      rescue StandardError => _e
+        # Ignore `undefined local variable or method 'component'` error
+      end
       scope
     end
   end