do not show disabled materials on material index and provider show

ElixirTeSS · Dec 20, 2024 · 901b037 · 901b037
1 parent bcb7db9
commit 901b037
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/app/models/material.rb b/app/models/material.rb
@@ -142,6 +142,14 @@ def self.facet_fields
     field_list
   end
 
+  def self.not_disabled
+    where('materials.visible is true')
+  end
+
+  def self.disabled
+    where('materials.visible is false')
+  end
+
   def self.check_exists(material_params)
     given_material = material_params.is_a?(Material) ? material_params : new(material_params)
     material = nil

diff --git a/app/views/content_providers/_content_provider.html.erb b/app/views/content_providers/_content_provider.html.erb
@@ -10,7 +10,7 @@
       </div>
 
       <% if content_provider.materials.length > 0 %>
-        <div><strong><%= pluralize(content_provider.materials.length, 'training material') %></strong></div>
+        <div><strong><%= pluralize(content_provider.materials.not_disabled.length, 'training material') %></strong></div>
       <% end %>
 
       <% if content_provider.events.length > 0 %>

diff --git a/app/views/content_providers/show.html.erb b/app/views/content_providers/show.html.erb
@@ -21,8 +21,8 @@
 
     <div class="my-3">
       <% resource_limit = 30 %>
-      <% materials = @content_provider.materials.from_verified_users.limit(resource_limit) %>
-      <% materials_count =  @content_provider.materials.from_verified_users.count %>
+      <% materials = @content_provider.materials.from_verified_users.not_disabled.limit(resource_limit) %>
+      <% materials_count =  @content_provider.materials.from_verified_users.not_disabled.count %>
       <% upcoming_events = @content_provider.events.from_verified_users.not_finished.not_disabled.order(start: :asc) %>
       <% past_events = @content_provider.events.from_verified_users.finished.not_disabled %>
       <% events = upcoming_events.limit(resource_limit) %>

diff --git a/lib/facets.rb b/lib/facets.rb
@@ -1,7 +1,7 @@
 module Facets
   SPECIAL = {
     include_expired: ->(c) { c.name == 'Event' },
-    include_disabled: ->(c) { c.name == 'Event' },
+    include_disabled: ->(c) { c.name == 'Event' || c.name == 'Material' },
     include_archived: ->(c) { c.name == 'Material' || c.name == 'LearningPath' },
     days_since_scrape: ->(c) { c.method_defined?(:last_scraped) },
     elixir: ->(c) { %w[Event Material ContentProvider].include?(c.name) },