gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add antenna setting error view

Browse source
This commit is contained in:
KMY 2023-05-24 12:55:31 +09:00
parent 29cf3b83bf
commit aa430a96b4
5 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/antenna.rb
View file

@ -220,7 +220,7 @@ class Antenna < ApplicationRecord
private
def validate_limit
errors.add(:base, I18n.t('scheduled_statuses.over_total_limit', limit: LIMIT)) if account.antennas.count >= LIMIT
errors.add(:base, I18n.t('antennas.errors.over_limit', limit: LIMIT)) if account.antennas.count >= LIMIT
end
def validate_stl_limit
@ -228,6 +228,6 @@ class Antenna < ApplicationRecord
stls = account.antennas.where(stl: true).where.not(id: id)
errors.add(:base, I18n.t('scheduled_statuses.over_total_limit', limit: LIMIT)) if list_id.zero? ? stls.any? { |tl| tl.list_id.zero? } : stls.any? { |tl| tl.list_id != 0 }
errors.add(:base, I18n.t('antennas.errors.over_stl_limit', limit: 1)) if list_id.zero? ? stls.any? { |tl| tl.list_id.zero? } : stls.any? { |tl| tl.list_id != 0 }
end
end

1
app/views/antennas/edit.html.haml
View file

@ -2,6 +2,7 @@
= t('antennas.edit.title')
= simple_form_for @antenna, url: antenna_path(@antenna), method: :put do |f|
= render 'shared/error_messages', object: @antenna
= render 'antenna_fields', f: f, lists: @lists
.actions

1
app/views/antennas/new.html.haml
View file

@ -2,6 +2,7 @@
= t('antennas.new.title')
= simple_form_for @antenna, url: antennas_path do |f|
= render 'shared/error_messages', object: @antenna
= render 'antenna_fields', f: f, lists: @lists
.actions