kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Improve model validation

This commit is contained in:
Kamil Trzciński 2018-09-04 11:50:58 +02:00
parent e6d2465d97
commit 5646f3f551
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/prometheus_metric.rb
View File

@ -23,7 +23,8 @@ class PrometheusMetric < ActiveRecord::Base
validates :y_label, presence: true
validates :unit, presence: true
validate :require_project
validates :project, presence: true, unless: :common?
validates :project, absence: true, if: :common?
scope :common, -> { where(common: true) }
@ -85,14 +86,4 @@ class PrometheusMetric < ActiveRecord::Base
}
end
end
private
def require_project
if project
errors.add(:project, "cannot be set if this is common metric") if common?
else
errors.add(:project, "has to be set when this is project-specific metric") unless common?
end
end
end