]> cat aescling's git repositories - mastodon.git/commitdiff
Add presence validation to Import (#1928)
authoralpaca-tc <alpaca-tc@alpaca.tc>
Sun, 16 Apr 2017 14:28:26 +0000 (23:28 +0900)
committerEugen <eugen@zeonfederated.com>
Sun, 16 Apr 2017 14:28:26 +0000 (16:28 +0200)
```
*An* `ActiveRecord::StatementInvalid` *occurred while* `POST </settings/import>` *was processed by* `imports#create`
Exception
----------------
PG::NotNullViolation: ERROR:  null value in column "type" violates not-null constraint
```

app/models/import.rb

index 3013bc50eb47c9a6b06efad2bb40dc3cabcf943b..85f6ca4bdf56b36da32f49c5e8d64efa009b915b 100644 (file)
@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 class Import < ApplicationRecord
+  FILE_TYPES = ['text/plain', 'text/csv'].freeze
+
   self.inheritance_column = false
 
-  enum type: [:following, :blocking, :muting]
+  belongs_to :account, required: true
 
-  belongs_to :account
+  enum type: [:following, :blocking, :muting]
 
-  FILE_TYPES = ['text/plain', 'text/csv'].freeze
+  validates :type, presence: true
 
   has_attached_file :data, url: '/system/:hash.:extension', hash_secret: ENV['PAPERCLIP_SECRET']
   validates_attachment_content_type :data, content_type: FILE_TYPES