scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1210 from okriuchykhin/ok_SCI_2376

Browse source 
Remove result validation [SCI-2376]
This commit is contained in:
okriuchykhin 2018-06-13 16:09:41 +02:00 committed by GitHub
parent 29fe58de80 e10ed86fa1
commit 69c25f10e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/models/result.rb
View file

@ -4,7 +4,6 @@ class Result < ApplicationRecord
auto_strip_attributes :name, nullify: false
validates :user, :my_module, presence: true
validates :name, length: { maximum: Constants::NAME_MAX_LENGTH }
validate :text_or_asset_or_table
belongs_to :user, inverse_of: :results, optional: true
belongs_to :last_modified_by,
@ -104,21 +103,4 @@ class Result < ApplicationRecord
true
end
end
private
def text_or_asset_or_table
num_of_assigns = 0
num_of_assigns += result_text.blank? ? 0 : 1
num_of_assigns += asset.blank? ? 0 : 1
num_of_assigns += table.blank? ? 0 : 1
# Theoretically, we should make sure == 1, not > 1,
# but due to GUI problems this is how it is
if num_of_assigns > 1
errors.add(:base, "Result can only be instance of text/asset/table.")
elsif num_of_assigns < 1
errors.add(:base, "Result should be instance of text/asset/table.")
end
end
end