Browse Source

Validate short display name at the same time as file

pull/2690/head
Kat 2 years ago
parent
commit
2abd8a4fb0
  1. 2
      app/controllers/collection_resources_controller.rb
  2. 4
      app/models/collection_resource.rb

2
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

4
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

Loading…
Cancel
Save