Merge tool-collections into staging

CruGlobal · Aug 2, 2023 · 0b379d7 · 0b379d7
2 parents 2d59fa1 + 9987dcb
commit 0b379d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/controllers/tool_groups_controller.rb b/app/controllers/tool_groups_controller.rb
@@ -52,8 +52,11 @@ def show
 
   def destroy
     tool_group = ToolGroup.find(params[:id])
-    tool_group.destroy!
-    head :no_content
+    if tool_group.destroy!
+      head :no_content
+    else
+      head :not_found
+    end
   end
 
   def update

diff --git a/app/models/tool_group.rb b/app/models/tool_group.rb
@@ -8,6 +8,6 @@ class ToolGroup < ApplicationRecord
   has_many :rule_languages, dependent: :destroy
   has_many :rule_countries, dependent: :destroy
   has_many :rule_praxes, class_name: "RulePraxis", dependent: :destroy
-  has_many :resource_tool_groups
+  has_many :resource_tool_groups, dependent: :destroy
   has_many :resources, through: :resource_tool_groups
 end