From 2abd8a4fb0f8c17dad7fd1e7935a6b3bf5005117 Mon Sep 17 00:00:00 2001
From: Kat <54268893+kosiakkatrina@users.noreply.github.com>
Date: Wed, 23 Oct 2024 08:39:42 +0100
Subject: [PATCH] Validate short display name at the same time as file

---
 app/controllers/collection_resources_controller.rb | 2 ++
 app/models/collection_resource.rb                  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/app/controllers/collection_resources_controller.rb b/app/controllers/collection_resources_controller.rb
index 7e84dc28c..5203ceea1 100644
--- a/app/controllers/collection_resources_controller.rb
+++ b/app/controllers/collection_resources_controller.rb
@@ -101,6 +101,7 @@ class CollectionResourcesController < ApplicationController
 
     @collection_resource.file = resource_params[:file]
     @collection_resource.validate_attached_file
+    @collection_resource.validate_short_display_name
     return render "collection_resources/edit" if @collection_resource.errors.any?
 
     @collection_resource.short_display_name = resource_params[:short_display_name]
@@ -162,6 +163,7 @@ class CollectionResourcesController < ApplicationController
     @collection_resource.display_name = "#{@collection_resource.log_type} #{@collection_resource.short_display_name} (#{text_year_range_format(@collection_resource.year)})"
 
     @collection_resource.validate_attached_file
+    @collection_resource.validate_short_display_name
     return render "collection_resources/new" if @collection_resource.errors.any?
 
     if @collection_resource.save
diff --git a/app/models/collection_resource.rb b/app/models/collection_resource.rb
index b44c605cb..cc217b8cd 100644
--- a/app/models/collection_resource.rb
+++ b/app/models/collection_resource.rb
@@ -31,4 +31,8 @@ class CollectionResource < ApplicationRecord
       end
     end
   end
+
+  def validate_short_display_name
+    errors.add(:short_display_name, :blank) if short_display_name.blank?
+  end
 end